Fix handling of the *.* extension case, before this fix it was being passed as a...

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 39ebcf6acaea1e3966f50282044e5a5696e13d82..ea02cf9f2b3c8b2e8f0b3f93744ce9a917054f3f 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -143,10 +143,25 @@ public :
 
     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 )
         if ( pos == (size_t) -1 )

-            [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
+            [m_osxMenu addItem:nsmenuitem ];

         else
         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 )