From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 16 Jul 2004 12:36:02 +0000 (+0000)
Subject: The interpreter popup was never filled with any data, fixed.
X-Git-Tag: v2.4a2~230
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=122f87fa040688ee9e7092797edab901e48fc26a;p=thirdparty%2FPython%2Fcpython.git

The interpreter popup was never filled with any data, fixed.
Fixes #775878.
---

diff --git a/Mac/OSX/PythonLauncher/PreferencesWindowController.h b/Mac/OSX/PythonLauncher/PreferencesWindowController.h
index 63c1836d5677..63469968c1e3 100644
--- a/Mac/OSX/PythonLauncher/PreferencesWindowController.h
+++ b/Mac/OSX/PythonLauncher/PreferencesWindowController.h
@@ -7,7 +7,7 @@
 @interface PreferencesWindowController : NSWindowController <FileSettingsSource>
 {
     IBOutlet NSPopUpButton *filetype;
-    IBOutlet NSTextField *interpreter;
+    IBOutlet NSComboBox *interpreter;
     IBOutlet NSButton *honourhashbang;
     IBOutlet NSButton *debug;
     IBOutlet NSButton *verbose;
diff --git a/Mac/OSX/PythonLauncher/PreferencesWindowController.m b/Mac/OSX/PythonLauncher/PreferencesWindowController.m
index 5dd08f36927c..311c37502bb2 100644
--- a/Mac/OSX/PythonLauncher/PreferencesWindowController.m
+++ b/Mac/OSX/PythonLauncher/PreferencesWindowController.m
@@ -29,6 +29,7 @@
 {
 //    [[self window] setTitle: script];
     
+	[interpreter reloadData];
     [interpreter setStringValue: [settings interpreter]];
     [honourhashbang setState: [settings honourhashbang]];
     [debug setState: [settings debug]];
@@ -97,17 +98,23 @@
 // NSComboBoxDataSource protocol
 - (unsigned int)comboBox:(NSComboBox *)aComboBox indexOfItemWithStringValue:(NSString *)aString
 {
-    return [[settings interpreters] indexOfObjectIdenticalTo: aString];
+	NSArray *interp_list = [settings interpreters];
+    unsigned int rv = [interp_list indexOfObjectIdenticalTo: aString];
+	return rv;
 }
 
 - (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index
 {
-    return [[settings interpreters] objectAtIndex: index];
+	NSArray *interp_list = [settings interpreters];
+    id rv = [interp_list objectAtIndex: index];
+	return rv;
 }
 
 - (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
 {
-    return [[settings interpreters] count];
+	NSArray *interp_list = [settings interpreters];
+    int rv = [interp_list count];
+	return rv;
 }