From 30cc8daf8a81311dda18aa8b74ab42154ec47a56 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 13 Jan 2000 21:20:15 +0000
Subject: [PATCH] Set menu when nib is loaded.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5742 72102866-910b-0410-8b05-ffd578937521
---
 Source/NSBundleAdditions.m | 12 ++++++++++++
 Source/NSMenu.m            |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index d8f6b1068..e0f184359 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -41,6 +41,8 @@
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
+#include <AppKit/NSApplication.h>
+#include <AppKit/NSMenu.h>
 #include <AppKit/NSControl.h>
 #include <AppKit/NSImage.h>
 #include <AppKit/NSView.h>
@@ -346,6 +348,7 @@
       NSNibConnector	*connection;
       NSString		*key;
       NSArray		*visible;
+      NSMenu		*menu;
 
       _isAwake = YES;
       /*
@@ -408,6 +411,15 @@
 	    }
 	}
 
+      /*
+       * See if there is a main menu to be set.
+       */
+      menu = [nameTable objectForKey: @"NSMenu"];
+      if (menu != nil && [menu isKindOfClass: [NSMenu class]] == YES)
+	{
+	  [NSApp setMainMenu: menu];
+	}
+
       /*
        * Now remove any objects added from the context dictionary.
        */
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 643a7ce03..6b59cf697 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -1060,6 +1060,11 @@ static NSString	*NSMenuLocationsKey = @"NSMenuLocations";
 	  if (location && [location isKindOfClass: [NSString class]])
 	    {
 	      [aWindow setFrameFromString: location];
+	      /*
+	       * May need resize in case saved frame is out of sync
+	       * with number of items in menu.
+	       */
+	      [self sizeToFit];
 	    }
 	  else
 	    {