[Python-checkins] python/dist/src/Mac/OSX/PythonLauncher PreferencesWindowController.h, 1.3, 1.4 PreferencesWindowController.m, 1.5, 1.6

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/OSX/PythonLauncher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1039

Modified Files:
	PreferencesWindowController.h PreferencesWindowController.m 
Log Message:
The interpreter popup was never filled with any data, fixed.
Fixes #775878.


Index: PreferencesWindowController.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/PythonLauncher/PreferencesWindowController.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PreferencesWindowController.h	17 Feb 2003 15:39:59 -0000	1.3
--- PreferencesWindowController.h	16 Jul 2004 12:36:02 -0000	1.4
***************
*** 8,12 ****
  {
      IBOutlet NSPopUpButton *filetype;
!     IBOutlet NSTextField *interpreter;
      IBOutlet NSButton *honourhashbang;
      IBOutlet NSButton *debug;
--- 8,12 ----
  {
      IBOutlet NSPopUpButton *filetype;
!     IBOutlet NSComboBox *interpreter;
      IBOutlet NSButton *honourhashbang;
      IBOutlet NSButton *debug;

Index: PreferencesWindowController.m
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/PythonLauncher/PreferencesWindowController.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PreferencesWindowController.m	20 Jun 2003 22:21:03 -0000	1.5
--- PreferencesWindowController.m	16 Jul 2004 12:36:02 -0000	1.6
***************
*** 30,33 ****
--- 30,34 ----
  //    [[self window] setTitle: script];
      
+ 	[interpreter reloadData];
      [interpreter setStringValue: [settings interpreter]];
      [honourhashbang setState: [settings honourhashbang]];
***************
*** 98,112 ****
  - (unsigned int)comboBox:(NSComboBox *)aComboBox indexOfItemWithStringValue:(NSString *)aString
  {
!     return [[settings interpreters] indexOfObjectIdenticalTo: aString];
  }
  
  - (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index
  {
!     return [[settings interpreters] objectAtIndex: index];
  }
  
  - (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
  {
!     return [[settings interpreters] count];
  }
  
--- 99,119 ----
  - (unsigned int)comboBox:(NSComboBox *)aComboBox indexOfItemWithStringValue:(NSString *)aString
  {
! 	NSArray *interp_list = [settings interpreters];
!     unsigned int rv = [interp_list indexOfObjectIdenticalTo: aString];
! 	return rv;
  }
  
  - (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index
  {
! 	NSArray *interp_list = [settings interpreters];
!     id rv = [interp_list objectAtIndex: index];
! 	return rv;
  }
  
  - (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
  {
! 	NSArray *interp_list = [settings interpreters];
!     int rv = [interp_list count];
! 	return rv;
  }