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

Revert to creating the app icon in finishLaunching, since existing

Browse source 
applications that do not use NSApplicationMain otherwise won't get an
app icon.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33242 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
wlux 2011-06-04 08:42:33 +00:00
parent 958269ba98
commit fe515ca1e1
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-06-04 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/Functions.m (NSApplicationMain):
* Source/NSApplication.m (-finishLaunching): Revert to creating
the app icon in finishLaunching, since existing applications that
do not use NSApplicationMain otherwise won't get an app icon.
2011-06-03 00:55-EDT Gregory John Casamento <greg.casamento@gmail.com> 2011-06-03 00:55-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/GSThemeMenu.m: Revert last change, since it will, * Source/GSThemeMenu.m: Revert last change, since it will,

9
Source/Functions.m
View file

@ -45,10 +45,6 @@
char **NSArgv = NULL; char **NSArgv = NULL;
@interface NSApplication(Private)
- (void) _appIconInit;
@end
/* /*
* Main initialization routine for the GNUstep GUI Library Apps * Main initialization routine for the GNUstep GUI Library Apps
*/ */
@ -79,11 +75,6 @@ NSApplicationMain(int argc, const char **argv)
} }
[appClass sharedApplication]; [appClass sharedApplication];
/* NB Create the app icon before any other window; otherwise the app icon
window will not be mapped by WindowMaker and the user will not get the
proper application menu. */
[NSApp _appIconInit];
mainModelFile = [infoDict objectForKey: @"NSMainNibFile"]; mainModelFile = [infoDict objectForKey: @"NSMainNibFile"];
if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO) if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO)
{ {

2
Source/NSApplication.m
View file

@ -996,6 +996,8 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
BOOL didAutoreopen = NO; BOOL didAutoreopen = NO;
NSArray *files = nil; NSArray *files = nil;
[self _appIconInit];
/* post notification that launch will finish */ /* post notification that launch will finish */
[nc postNotificationName: NSApplicationWillFinishLaunchingNotification [nc postNotificationName: NSApplicationWillFinishLaunchingNotification
object: self]; object: self];