Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 22fabe534468999459a46df9ebc5ec4e60328732..760f159263c302440136f66ee3c13eba694b9df6 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -18,16 +18,16 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/menu.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-    #include "wx/frame.h"
-    #include "wx/menuitem.h"
+#include "wx/log.h"
+#include "wx/app.h"
+#include "wx/utils.h"
+#include "wx/frame.h"
+#include "wx/menuitem.h"

 #endif
 
 #endif
 

+#include "wx/menu.h"
+

 #include "wx/osx/private.h"
 
 // other standard headers
 #include "wx/osx/private.h"
 
 // other standard headers


@@ -55,12 +55,20 @@
 
 @end
 
 
 @end
 

+// this is more compatible, as it is also called for command-key shortcuts
+// and under 10.4, we are not getting a 'close' event however...
+#define wxOSX_USE_NEEDSUPDATE_HOOK 1
+

 @interface wxNSMenuController : NSObject wxOSX_10_6_AND_LATER(<NSMenuDelegate>)
 {
 }
 
 @interface wxNSMenuController : NSObject wxOSX_10_6_AND_LATER(<NSMenuDelegate>)
 {
 }
 

+#if wxOSX_USE_NEEDSUPDATE_HOOK
+- (void)menuNeedsUpdate:(NSMenu*)smenu;
+#else

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

+#endif

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


@@ -73,6 +81,19 @@
     return self;
 }
 
     return self;
 }
 

+#if wxOSX_USE_NEEDSUPDATE_HOOK
+- (void)menuNeedsUpdate:(NSMenu*)smenu
+{
+    wxNSMenu* menu = (wxNSMenu*) smenu;
+    wxMenuImpl* menuimpl = [menu implementation];
+    if ( menuimpl )
+    {
+        wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
+        if ( wxpeer )
+            wxpeer->HandleMenuOpened();
+    }
+}
+#else

 - (void)menuWillOpen:(NSMenu *)smenu
 {
     wxNSMenu* menu = (wxNSMenu*) smenu;
 - (void)menuWillOpen:(NSMenu *)smenu
 {
     wxNSMenu* menu = (wxNSMenu*) smenu;


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

+#endif

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


@@ -144,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() )