Make wxMenuItemAction: and validateMenuItem: delegate messages take an

NSWindow* parameter instead of an id.

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

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 0b2491e70cb8b01e31c8711b9efc780979d3b335..761b28ee0852823b14681190eaaf6b77a44f5406 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -19,6 +19,7 @@ WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 class WXDLLEXPORT wxMenuBar;
 
 
 class WXDLLEXPORT wxMenuBar;
 

+DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);

 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 class wxCocoaNSWindow
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 class wxCocoaNSWindow


@@ -36,8 +37,8 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void) { }
     virtual void CocoaDelegate_windowDidBecomeMain(void) { }
     virtual void CocoaDelegate_windowDidResignMain(void) { }
     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 void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
+    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;

     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
 protected:
     wxCocoaNSWindow();
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
 protected:
     wxCocoaNSWindow();

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 7cc666b111d8dd0d4ee1a9a52f4cf2e94747107b..821d77d462bdb9aaaaf11a225bcf9959e7f0956b 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -67,8 +67,8 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void);
     virtual void CocoaDelegate_windowDidBecomeMain(void);
     virtual void CocoaDelegate_windowDidResignMain(void);
     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 void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem sender);
+    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem sender);

     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
     static void DeactivatePendingWindow();
 protected:
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
     static void DeactivatePendingWindow();
 protected:

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index bde3aa64ce32cf24b851170e693585e4711be6a8..1f8663740c8c3e02be3a7e4c40efbea02b0c2b7c 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -51,8 +51,8 @@
 - (void)windowWillClose: (NSNotification *)notification;
 
 // Menu item handlers
 - (void)windowWillClose: (NSNotification *)notification;
 
 // Menu item handlers

-- (void)wxMenuItemAction: (id)sender;
-- (BOOL)validateMenuItem: (id)menuItem;
+- (void)wxMenuItemAction: (NSMenuItem *)menuItem;
+- (BOOL)validateMenuItem: (NSMenuItem *)menuItem;

 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject
 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject


@@ -129,13 +129,13 @@
 }
 
 // Menu item handlers
 }
 
 // Menu item handlers

-- (void)wxMenuItemAction: (id)sender
+- (void)wxMenuItemAction: (NSMenuItem *)sender

 {
     wxASSERT(m_wxCocoaInterface);
     m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
 }
 
 {
     wxASSERT(m_wxCocoaInterface);
     m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
 }
 

-- (BOOL)validateMenuItem: (id)sender
+- (BOOL)validateMenuItem: (NSMenuItem *)sender

 {
     wxASSERT(m_wxCocoaInterface);
     return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
 {
     wxASSERT(m_wxCocoaInterface);
     return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 9f4518bbfbb99f94f306676b2d07f4b753942db9..d87628547c97e560ed367bd579ac348cbaf92cbd 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -232,11 +232,11 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
     return wxWindowBase::Close(false);
 }
 
     return wxWindowBase::Close(false);
 }
 

-void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(struct objc_object *sender)
+void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem)

 {
 }
 
 {
 }
 

-bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(struct objc_object *sender)
+bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem)

 {
     return false;
 }
 {
     return false;
 }