traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fixes #775878.
This commit is contained in:
Jack Jansen 2004-07-16 12:36:02 +00:00
parent 6e3b425f3f
commit 122f87fa04
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/OSX/PythonLauncher/PreferencesWindowController.h
View File

@ -7,7 +7,7 @@
@interface PreferencesWindowController : NSWindowController <FileSettingsSource> @interface PreferencesWindowController : NSWindowController <FileSettingsSource>
{ {
IBOutlet NSPopUpButton *filetype; IBOutlet NSPopUpButton *filetype;
IBOutlet NSTextField *interpreter; IBOutlet NSComboBox *interpreter;
IBOutlet NSButton *honourhashbang; IBOutlet NSButton *honourhashbang;
IBOutlet NSButton *debug; IBOutlet NSButton *debug;
IBOutlet NSButton *verbose; IBOutlet NSButton *verbose;

13
Mac/OSX/PythonLauncher/PreferencesWindowController.m
View File

@ -29,6 +29,7 @@
{ {
// [[self window] setTitle: script]; // [[self window] setTitle: script];
[interpreter reloadData];
[interpreter setStringValue: [settings interpreter]]; [interpreter setStringValue: [settings interpreter]];
[honourhashbang setState: [settings honourhashbang]]; [honourhashbang setState: [settings honourhashbang]];
[debug setState: [settings debug]]; [debug setState: [settings debug]];
@ -97,17 +98,23 @@
// NSComboBoxDataSource protocol // NSComboBoxDataSource protocol
- (unsigned int)comboBox:(NSComboBox *)aComboBox indexOfItemWithStringValue:(NSString *)aString - (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 - (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 - (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
{ {
return [[settings interpreters] count]; NSArray *interp_list = [settings interpreters];
int rv = [interp_list count];
return rv;
} }