The interpreter popup was never filled with any data, fixed.

jackjansen · jackjansen · commit 122f87fa0406 · 2004-07-16T12:36:02.000Z
Fixes #775878.
diff --git 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
@@ -29,6 +29,7 @@ - (void)update_display
 {
 //    [[self window] setTitle: script];
     
+	[interpreter reloadData];
     [interpreter setStringValue: [settings interpreter]];
     [honourhashbang setState: [settings honourhashbang]];
     [debug setState: [settings debug]];
@@ -97,17 +98,23 @@ - (void)controlTextDidChange:(NSNotification *)aNotification
 // 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;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`@interface PreferencesWindowController : NSWindowController <FileSettingsSource>`
`8`	`8`	`{`
`9`	`9`	`IBOutlet NSPopUpButton *filetype;`
`10`		`- IBOutlet NSTextField *interpreter;`
	`10`	`+ IBOutlet NSComboBox *interpreter;`
`11`	`11`	`IBOutlet NSButton *honourhashbang;`
`12`	`12`	`IBOutlet NSButton *debug;`
`13`	`13`	`IBOutlet NSButton *verbose;`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ - (void)update_display`
`29`	`29`	`{`
`30`	`30`	`// [[self window] setTitle: script];`
`31`	`31`
	`32`	`+ [interpreter reloadData];`
`32`	`33`	`[interpreter setStringValue: [settings interpreter]];`
`33`	`34`	`[honourhashbang setState: [settings honourhashbang]];`
`34`	`35`	`[debug setState: [settings debug]];`
`@@ -97,17 +98,23 @@ - (void)controlTextDidChange:(NSNotification *)aNotification`
`97`	`98`	`// NSComboBoxDataSource protocol`
`98`	`99`	`- (unsigned int)comboBox:(NSComboBox )aComboBox indexOfItemWithStringValue:(NSString )aString`
`99`	`100`	`{`
`100`		`- return [[settings interpreters] indexOfObjectIdenticalTo: aString];`
	`101`	`+ NSArray *interp_list = [settings interpreters];`
	`102`	`+ unsigned int rv = [interp_list indexOfObjectIdenticalTo: aString];`
	`103`	`+ return rv;`
`101`	`104`	`}`
`102`	`105`
`103`	`106`	`- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index`
`104`	`107`	`{`
`105`		`- return [[settings interpreters] objectAtIndex: index];`
	`108`	`+ NSArray *interp_list = [settings interpreters];`
	`109`	`+ id rv = [interp_list objectAtIndex: index];`
	`110`	`+ return rv;`
`106`	`111`	`}`
`107`	`112`
`108`	`113`	`- (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox`
`109`	`114`	`{`
`110`		`- return [[settings interpreters] count];`
	`115`	`+ NSArray *interp_list = [settings interpreters];`
	`116`	`+ int rv = [interp_list count];`
	`117`	`+ return rv;`
`111`	`118`	`}`
`112`	`119`
`113`	`120`