Revert to creating the app icon in finishLaunching, since existing

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

ChangeLog

@@ -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>
 
 	* Source/GSThemeMenu.m: Revert last change, since it will,

Source/Functions.m

@@ -45,10 +45,6 @@
 
 char **NSArgv = NULL;
 
-@interface NSApplication(Private)
-- (void) _appIconInit;
-@end
-
 /*
  * Main initialization routine for the GNUstep GUI Library Apps
  */
@@ -79,11 +75,6 @@ NSApplicationMain(int argc, const char **argv)
     }
   [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"];
   if (mainModelFile != nil && [mainModelFile isEqual: @""] == NO)
     {

Source/NSApplication.m

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