diff options
author | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-11-17 15:53:57 +0000 |
commit | 3fce787ffe938bb3e959ff0b3ec231e54d086c76 (patch) | |
tree | 198f537b43a34301bf781c67193c572f6743f925 /xorg-server/hw/xquartz/X11Controller.m | |
parent | 236c69d6034b152598ce35abaf3559b0eaa89c12 (diff) | |
parent | 578938f1cdd5a06dd6fa28167d575ec980322a5d (diff) | |
download | vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.gz vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.tar.bz2 vcxsrv-3fce787ffe938bb3e959ff0b3ec231e54d086c76.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xquartz/X11Controller.m')
-rw-r--r-- | xorg-server/hw/xquartz/X11Controller.m | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m index 119154764..b28f4d303 100644 --- a/xorg-server/hw/xquartz/X11Controller.m +++ b/xorg-server/hw/xquartz/X11Controller.m @@ -426,8 +426,8 @@ [[columns objectAtIndex:2] setIdentifier:@"2"]; [apps_table setDataSource:self]; - [apps_table selectRow:0 byExtendingSelection:NO]; - + [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; + [[apps_table window] makeKeyAndOrderFront:sender]; [apps_table reloadData]; if(oldapps != nil) @@ -474,7 +474,7 @@ [item release]; [apps_table reloadData]; - [apps_table selectRow:row byExtendingSelection:NO]; + [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; } - (IBAction) apps_table_duplicate:sender @@ -497,7 +497,7 @@ [item release]; [apps_table reloadData]; - [apps_table selectRow:row+1 byExtendingSelection:NO]; + [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO]; } - (IBAction) apps_table_delete:sender @@ -519,10 +519,10 @@ row = MIN (row, [table_apps count] - 1); if (row >= 0) - [apps_table selectRow:row byExtendingSelection:NO]; + [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; } -- (int) numberOfRowsInTableView:(NSTableView *)tableView +- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView { if (table_apps == nil) return 0; @@ -530,7 +530,7 @@ } - (id) tableView:(NSTableView *)tableView -objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row +objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { NSArray *item; int col; @@ -547,7 +547,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row } - (void) tableView:(NSTableView *)tableView setObjectValue:(id)object - forTableColumn:(NSTableColumn *)tableColumn row:(int)row + forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { NSMutableArray *item; int col; |