Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxMenuItemAction: and validateMenuItem: delegate messages take an

Browse Source 
NSWindow* parameter instead of an id.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-02-27 06:07:47 +00:00
parent 9c329f86c6
commit 7dd8b1ea10
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/cocoa/NSWindow.h
View File

@@ -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); DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
class wxCocoaNSWindow class wxCocoaNSWindow
@@ -36,8 +37,8 @@ public:
virtual void CocoaDelegate_windowDidResignKey(void) { } virtual void CocoaDelegate_windowDidResignKey(void) { }
virtual void CocoaDelegate_windowDidBecomeMain(void) { } virtual void CocoaDelegate_windowDidBecomeMain(void) { }
virtual void CocoaDelegate_windowDidResignMain(void) { } virtual void CocoaDelegate_windowDidResignMain(void) { }
virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender) = 0; virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0;
virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender) = 0; virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0;
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
protected: protected:
wxCocoaNSWindow(); wxCocoaNSWindow();

4
include/wx/cocoa/toplevel.h
View File

@@ -67,8 +67,8 @@ public:
virtual void CocoaDelegate_windowDidResignKey(void); virtual void CocoaDelegate_windowDidResignKey(void);
virtual void CocoaDelegate_windowDidBecomeMain(void); virtual void CocoaDelegate_windowDidBecomeMain(void);
virtual void CocoaDelegate_windowDidResignMain(void); virtual void CocoaDelegate_windowDidResignMain(void);
virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender); virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem sender);
virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender); virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem sender);
virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
static void DeactivatePendingWindow(); static void DeactivatePendingWindow();
protected: protected:

8
src/cocoa/NSWindow.mm
View File

@@ -51,8 +51,8 @@
- (void)windowWillClose: (NSNotification *)notification; - (void)windowWillClose: (NSNotification *)notification;
// Menu item handlers // Menu item handlers
- (void)wxMenuItemAction: (id)sender; - (void)wxMenuItemAction: (NSMenuItem *)menuItem;
- (BOOL)validateMenuItem: (id)menuItem; - (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
@end //interface wxNSWindowDelegate @end //interface wxNSWindowDelegate
@implementation wxNSWindowDelegate : NSObject @implementation wxNSWindowDelegate : NSObject
@@ -129,13 +129,13 @@
} }
// Menu item handlers // Menu item handlers
- (void)wxMenuItemAction: (id)sender - (void)wxMenuItemAction: (NSMenuItem *)sender
{ {
wxASSERT(m_wxCocoaInterface); wxASSERT(m_wxCocoaInterface);
m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender); m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
} }
- (BOOL)validateMenuItem: (id)sender - (BOOL)validateMenuItem: (NSMenuItem *)sender
{ {
wxASSERT(m_wxCocoaInterface); wxASSERT(m_wxCocoaInterface);
return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender); return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);

4
src/cocoa/toplevel.mm
View File

@@ -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;
} }