fix positioning bug with window disabler and hidden windows

[wxWidgets.git] / src / osx / cocoa / menu.mm

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 34cd2079e2e5daabe7bbcfd51e61e72542b9f60d..053c1200520ef980c26e3d0905cc60b389446f32 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -36,9 +36,9 @@
 
 @implementation wxNSMenu
 
-- (id) init
+- (id) initWithTitle:(NSString*) title
 {
-    [super init];
+    [super initWithTitle:title];
     impl = NULL;
     return self;
 }
@@ -55,7 +55,7 @@
 
 @end
 
-@interface wxNSMenuController : NSObject <NSMenuDelegate>
+@interface wxNSMenuController : NSObject wxOSX_10_6_AND_LATER(<NSMenuDelegate>)
 {
 }
 
@@ -117,11 +117,11 @@
 
 @end
 
-@interface NSApplication(MissingAppleMenuCall) 
-- (void)setAppleMenu:(NSMenu *)menu; 
-@end 
+@interface NSApplication(MissingAppleMenuCall)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
 
-class wxMenuCocoaImpl : public wxMenuImpl 
+class wxMenuCocoaImpl : public wxMenuImpl
 {
 public :
     wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
@@ -138,22 +138,37 @@ public :
             CFRetain(m_osxMenu);
         [m_osxMenu release];
     }
-    
+
     virtual ~wxMenuCocoaImpl();
-        
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) 
+
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
+        NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
+        // make sure a call of SetSubMenu is also reflected (occuring after Create)
+        // update the native menu item accordingly
+        
+        if ( pItem->IsSubMenu() )
+        {
+            wxMenu* wxsubmenu = pItem->GetSubMenu();
+            WXHMENU nssubmenu = wxsubmenu->GetHMenu();
+            if ( [nsmenuitem submenu] != nssubmenu )
+            {
+                wxsubmenu->GetPeer()->SetTitle( pItem->GetItemLabelText() );
+                [nsmenuitem setSubmenu:nssubmenu];
+            }
+        }
+        
         if ( pos == (size_t) -1 )
-            [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
+            [m_osxMenu addItem:nsmenuitem ];
         else
-            [m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
+            [m_osxMenu insertItem:nsmenuitem atIndex:pos];
     }
-        
-    virtual void Remove( wxMenuItem *pItem ) 
+
+    virtual void Remove( wxMenuItem *pItem )
     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }
-    
+
     virtual void MakeRoot()
     {
         [NSApp setMainMenu:m_osxMenu];
@@ -163,7 +178,7 @@ public :
     virtual void Enable( bool WXUNUSED(enable) )
     {
     }
-    
+
     virtual void SetTitle( const wxString& text )
     {
         wxCFStringRef cfText(text);