Implement wxMenuItemAction: and validateMenuItem: delegate messages

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 808656f44267aea418fe4475c01ce5f5e7b677aa..0b2491e70cb8b01e31c8711b9efc780979d3b335 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -36,6 +36,8 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void) { }
     virtual void CocoaDelegate_windowDidBecomeMain(void) { }
     virtual void CocoaDelegate_windowDidResignMain(void) { }
+    virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender) = 0;
+    virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender) = 0;
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
 protected:
     wxCocoaNSWindow();

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 8276028e6761e9a3827b77d2924649a81ee00e2a..7cc666b111d8dd0d4ee1a9a52f4cf2e94747107b 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -67,6 +67,8 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void);
     virtual void CocoaDelegate_windowDidBecomeMain(void);
     virtual void CocoaDelegate_windowDidResignMain(void);
+    virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender);
+    virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender);
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
     static void DeactivatePendingWindow();
 protected:

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index a0c4a5f196d7d3f3e6c9c78dcad268b2bc7e10b1..bde3aa64ce32cf24b851170e693585e4711be6a8 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -49,6 +49,10 @@
 - (void)windowDidResignMain: (NSNotification *)notification;
 - (BOOL)windowShouldClose: (id)sender;
 - (void)windowWillClose: (NSNotification *)notification;
+
+// Menu item handlers
+- (void)wxMenuItemAction: (id)sender;
+- (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject
@@ -69,6 +73,7 @@
     return m_wxCocoaInterface;
 }
 
+// Delegate message handlers
 - (void)windowDidBecomeKey: (NSNotification *)notification
 {
     wxCocoaNSWindow *win = wxCocoaNSWindow::GetFromCocoa([notification object]);
@@ -123,6 +128,19 @@
     win->CocoaDelegate_windowWillClose();
 }
 
+// Menu item handlers
+- (void)wxMenuItemAction: (id)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
+}
+
+- (BOOL)validateMenuItem: (id)sender
+{
+    wxASSERT(m_wxCocoaInterface);
+    return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
+}
+
 @end //implementation wxNSWindowDelegate
 
 // ============================================================================

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 9cdfa7a7835bbc7186307c8cfb50f13aa2a1af71..9f4518bbfbb99f94f306676b2d07f4b753942db9 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -232,6 +232,15 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
     return wxWindowBase::Close(false);
 }
 
+void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(struct objc_object *sender)
+{
+}
+
+bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(struct objc_object *sender)
+{
+    return false;
+}
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa maximize/minimize
 // ----------------------------------------------------------------------------