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

Send all menu item actions to a dedicated target. This is to ensure

Browse Source 
the actions always make it to the proper wxFrame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-28 17:49:51 +00:00
parent 0ff1f245a9
commit 2fc2d511d0
9 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ public:
void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
virtual void Cocoa_close(void) = 0;
virtual bool Cocoa_windowShouldClose(void) = 0;
virtual void Cocoa_wxMenuItemAction(wxMenuItem& item) = 0;
virtual void CocoaNotification_DidBecomeKey(void) { }
virtual void CocoaNotification_DidResignKey(void) { }
protected:

2
include/wx/cocoa/frame.h
View File

@@ -13,7 +13,6 @@
#define _WX_COCOA_FRAME_H_
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenuItem;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxFrame: public wxFrameBase
@@ -52,7 +51,6 @@ protected:
// Cocoa specifics
// ------------------------------------------------------------------------
protected:
virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
virtual void CocoaSetWxWindowSize(int width, int height);
// Helper function to position status/tool bars

1
include/wx/cocoa/menuitem.h
View File

@@ -52,6 +52,7 @@ public:
protected:
WX_NSMenuItem m_cocoaNSMenuItem;
static wxMenuItemCocoaHash sm_cocoaHash;
static struct objc_object *sm_cocoaTarget;
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------

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

@@ -61,7 +61,6 @@ public:
inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
virtual void Cocoa_close(void);
virtual bool Cocoa_windowShouldClose(void);
virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
virtual void CocoaNotification_DidBecomeKey(void);
virtual void CocoaNotification_DidResignKey(void);
protected: