Add wxTimer::StartOnce().

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index a252e9ce3a8848865b10c829fd1dc626557b44f3..70e4fc3aaf6fb0b277cef538f910d48bc5b8561a 100644 (file)
--- 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)menuNeedsUpdate:(NSMenu*)smenu;
 #else
 - (void)menuWillOpen:(NSMenu *)menu;

-- (void)menuDidClose:(NSMenu *)menu;

 #endif
 #endif

+- (void)menuDidClose:(NSMenu *)menu;

 - (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item;
 
 @end
 - (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item;
 
 @end


@@ -105,6 +105,7 @@
             wxpeer->HandleMenuOpened();
     }
 }
             wxpeer->HandleMenuOpened();
     }
 }

+#endif

 
 - (void)menuDidClose:(NSMenu *)smenu
 {
 
 - (void)menuDidClose:(NSMenu *)smenu
 {


@@ -117,7 +118,6 @@
             wxpeer->HandleMenuClosed();
     }
 }
             wxpeer->HandleMenuClosed();
     }
 }

-#endif

 
 - (void)menu:(NSMenu *)smenu willHighlightItem:(NSMenuItem *)item
 {
 
 - (void)menu:(NSMenu *)smenu willHighlightItem:(NSMenuItem *)item
 {


@@ -166,7 +166,7 @@ public :
     virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
     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() )
         // update the native menu item accordingly
         
         if ( pItem->IsSubMenu() )