From ed724a3ae7eb83d498f75e465e2f1816d6834da6 Mon Sep 17 00:00:00 2001
From: michael <michael@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 13 Jul 1999 01:39:46 +0000
Subject: [PATCH] Fixed small NSMenu bugglets.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4574 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog       |  6 ++++++
 Source/NSMenu.m | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43d65afb4..8ea1bc069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-12  Michael Hanni  <mhanni@sprintmail.com>
+
+	* Source/NSMenu.m: added code to convert anything that conforms to
+	<NSMenuItem> into an NSMenuItemCell. Not tested, but should work.
+	Also fixed a small bug in -init, it was not returning.
+
 Mon Jul 12  5:40:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSOpenPanel.m: In ([-runModalForTypes:]) made change
diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index e4e2a2424..7ef67dc31 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -61,7 +61,7 @@ static NSZone *menuZone = NULL;
 
 - (id)init
 {
-  [self initWithTitle:@"Menu"];
+  return [self initWithTitle:@"Menu"];
 }
 
 - (id)initWithTitle:(NSString *)aTitle
@@ -89,13 +89,37 @@ static NSZone *menuZone = NULL;
   return self;
 }
 
+/*
+ * - (void)insertItem:(id <NSMenuItem>)newItem
+ *            atIndex:(int)index
+ *
+ * This method has been modified to convert anything that conforms to the
+ * <NSMenuItem> Protocol into a NSMenuItemCell which will be added to the
+ * items array.
+ *
+ * Blame: Michael
+ */
+
 - (void)insertItem:(id <NSMenuItem>)newItem
 	   atIndex:(int)index
 {
-  if ([(NSMenuItemCell *)newItem isKindOfClass:[NSMenuItemCell class]])
-    [menu_items insertObject:newItem atIndex:index];
+  if ([newItem conformsToProtocol:@protocol(NSMenuItem)])
+    {
+      if ([newItem isKindOfClass:[NSMenuItemCell class]])
+        [menu_items insertObject:newItem atIndex:index];
+      else
+        {
+          [self insertItemWithTitle:[newItem title]
+			     action:[newItem action]
+		      keyEquivalent:[newItem keyEquivalent]
+			    atIndex:index];
+	  [(NSMenuItem *)newItem release];
+        }
+    }
   else
-    NSLog(@"You must use an NSMenuItemCell, or a derivative thereof.\n");
+    NSLog(@"You must use an object that conforms to NSMenuItem.\n");
+
+  menu_changed = YES;
 }
 
 - (id <NSMenuItem>)insertItemWithTitle:(NSString *)aString
@@ -117,13 +141,7 @@ static NSZone *menuZone = NULL;
 
 - (void)addItem:(id <NSMenuItem>)newItem
 {
-  // The spec says we call [self insertItem]; but why waste the overhead?
-  if ([(NSMenuItemCell *)newItem isKindOfClass:[NSMenuItemCell class]])
-    [menu_items insertObject:newItem atIndex:[menu_items count]];
-  else
-    NSLog(@"You must use an NSMenuItemCell, or a derivative thereof.\n");
-
-  menu_changed = YES;
+  [self insertItem:newItem atIndex:[menu_items count]];
 }
 
 - (id <NSMenuItem>)addItemWithTitle:(NSString *)aString