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

Allow the dealloc message to be caught

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-10-15 02:55:15 +00:00
parent d04995b3a6
commit 3312496dcc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ public:
, OBSERVE_DidSendAction = 0x08 , OBSERVE_DidSendAction = 0x08
, OBSERVE_WillSendAction = 0x10 , OBSERVE_WillSendAction = 0x10
}; };
virtual void Cocoa_dealloc() {}
virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {} virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {}
virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {} virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {} virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}

13
src/cocoa/NSMenu.mm
View File

@@ -16,12 +16,11 @@
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/cocoa/NSMenu.h" #include "wx/cocoa/NSMenu.h"
//#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/ObjcPose.h"
#import <Foundation/NSNotification.h> #import <Foundation/NSNotification.h>
#import <AppKit/NSMenu.h> #import <AppKit/NSMenu.h>
#if 0 // There is no reason to pose for NSMenu at this time.
// ============================================================================ // ============================================================================
// @class wxPoserNSMenu // @class wxPoserNSMenu
// ============================================================================ // ============================================================================
@@ -29,13 +28,21 @@
{ {
} }
- (void)dealloc;
@end // wxPoserNSMenu @end // wxPoserNSMenu
WX_IMPLEMENT_POSER(wxPoserNSMenu); WX_IMPLEMENT_POSER(wxPoserNSMenu);
@implementation wxPoserNSMenu : NSMenu @implementation wxPoserNSMenu : NSMenu
- (void)dealloc
{
wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
if(menu)
menu->Cocoa_dealloc();
}
@end // wxPoserNSMenu @end // wxPoserNSMenu
#endif // 0
// ============================================================================ // ============================================================================
// @class wxNSMenuNotificationObserver // @class wxNSMenuNotificationObserver