X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f4bed8ad4733a0b7bb828a63a74883e52939e3d..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/src/osx/cocoa/menu.mm diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm index 1a632e95f6..70e4fc3aaf 100644 --- a/src/osx/cocoa/menu.mm +++ b/src/osx/cocoa/menu.mm @@ -67,8 +67,8 @@ - (void)menuNeedsUpdate:(NSMenu*)smenu; #else - (void)menuWillOpen:(NSMenu *)menu; -- (void)menuDidClose:(NSMenu *)menu; #endif +- (void)menuDidClose:(NSMenu *)menu; - (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item; @end @@ -105,6 +105,7 @@ wxpeer->HandleMenuOpened(); } } +#endif - (void)menuDidClose:(NSMenu *)smenu { @@ -117,7 +118,6 @@ wxpeer->HandleMenuClosed(); } } -#endif - (void)menu:(NSMenu *)smenu willHighlightItem:(NSMenuItem *)item { @@ -155,7 +155,6 @@ public : } [menu setDelegate:controller]; [m_osxMenu setImplementation:this]; - [menu setAutoenablesItems:NO]; // gc aware if ( m_osxMenu ) CFRetain(m_osxMenu); @@ -167,7 +166,7 @@ public : 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) + // make sure a call of SetSubMenu is also reflected (occurring after Create) // update the native menu item accordingly if ( pItem->IsSubMenu() )