Fixed menu creation in eVC3

[wxWidgets.git] / src / cocoa / menuitem.mm

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index ba92f411a82411b18362aec801eb98b2f586e687..e5e5e7659d0b9ce07214bf9a496ced42c9f9cf04 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -47,6 +47,7 @@
 }
 
 - (void)wxMenuItemAction: (id)sender;
 }
 
 - (void)wxMenuItemAction: (id)sender;

+- (BOOL)validateMenuItem: (id)menuItem;

 @end //interface wxNSMenuItemTarget
 
 @implementation wxNSMenuItemTarget : NSObject
 @end //interface wxNSMenuItemTarget
 
 @implementation wxNSMenuItemTarget : NSObject


@@ -64,10 +65,19 @@
     {
         wxFrame *frame = menubar->GetFrame();
         wxCHECK_RET(frame, "wxMenuBar MUST be attached to a wxFrame!");
     {
         wxFrame *frame = menubar->GetFrame();
         wxCHECK_RET(frame, "wxMenuBar MUST be attached to a wxFrame!");

-        frame->Command(item->GetId());
+        frame->ProcessCommand(item->GetId());

     }
 }
 
     }
 }
 

+- (BOOL)validateMenuItem: (id)menuItem
+{
+    // TODO: Do wxWindows validation here and avoid sending during idle time
+    wxLogDebug("wxMenuItemAction");
+    wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
+    wxCHECK_MSG(item,NO,"validateMenuItem received but no wxMenuItem exists!");
+    return item->IsEnabled();
+}
+

 @end //implementation wxNSMenuItemTarget
 
 // ============================================================================
 @end //implementation wxNSMenuItemTarget
 
 // ============================================================================