gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5132 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-11-04 16:34:15 +00:00
parent b987fd74ec
commit 706b7fff80
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Nov 4 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSApplication.m: ([-runModalforWindow:]) make the window key
and order to front as specified in MacOS-X docs.
* Source/NSPanel.m: Remove redundant code from alert panels -
now done in NSApplication.
Tue Nov 2 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Tue Nov 2 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSMatrix.m: Complete rewrite of code for handling cells * Source/NSMatrix.m: Complete rewrite of code for handling cells

4
Source/NSApplication.m
View file

@ -612,6 +612,10 @@ static NSCell* tileCell = nil;
if ([theWindow isKindOfClass: [NSPanel class]]) if ([theWindow isKindOfClass: [NSPanel class]])
[theWindow center]; [theWindow center];
if ([self isActive])
[theWindow makeKeyWindow];
[theWindow orderFrontRegardless];
theSession = NULL; theSession = NULL;
code = NSRunContinuesResponse; code = NSRunContinuesResponse;

17
Source/NSPanel.m
View file

@ -434,11 +434,8 @@ static GSAlertPanel *gmodelAlertPanel = nil;
- (int) runModal - (int) runModal
{ {
NSApplication *app;
app = [NSApplication sharedApplication];
active = YES; active = YES;
[app runModalForWindow: self]; [NSApp runModalForWindow: self];
return result; return result;
} }
@ -690,9 +687,6 @@ NSRunAlertPanel(NSString *title,
standardAlertPanel = panel; standardAlertPanel = panel;
} }
if ([NSApp isActive])
[panel makeKeyWindow];
[panel orderFrontRegardless];
result = [panel runModal]; result = [panel runModal];
NSReleaseAlertPanel(panel); NSReleaseAlertPanel(panel);
return result; return result;
@ -714,9 +708,6 @@ NSRunCriticalAlertPanel(NSString *title,
defaultButton, alternateButton, otherButton, ap); defaultButton, alternateButton, otherButton, ap);
va_end (ap); va_end (ap);
if ([NSApp isActive])
[panel makeKeyWindow];
[panel orderFrontRegardless];
result = [panel runModal]; result = [panel runModal];
NSReleaseAlertPanel(panel); NSReleaseAlertPanel(panel);
return result; return result;
@ -738,9 +729,6 @@ NSRunInformationalAlertPanel(NSString *title,
defaultButton, alternateButton, otherButton, ap); defaultButton, alternateButton, otherButton, ap);
va_end (ap); va_end (ap);
if ([NSApp isActive])
[panel makeKeyWindow];
[panel orderFrontRegardless];
result = [panel runModal]; result = [panel runModal];
NSReleaseAlertPanel(panel); NSReleaseAlertPanel(panel);
return result; return result;
@ -803,9 +791,6 @@ NSRunLocalizedAlertPanel(NSString *table,
standardAlertPanel = panel; standardAlertPanel = panel;
} }
if ([NSApp isActive])
[panel makeKeyWindow];
[panel orderFrontRegardless];
result = [panel runModal]; result = [panel runModal];
NSReleaseAlertPanel(panel); NSReleaseAlertPanel(panel);
return result; return result;