Allow the dealloc message to be caught

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

diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index 4d5df93f2a8ff81fd731b1f8b5ab3ae5a0d0e60e..146b9d66b755c9dd46c330cfdd04317ed5d10ec9 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -34,6 +34,7 @@ public:
     ,   OBSERVE_DidSendAction       = 0x08
     ,   OBSERVE_WillSendAction      = 0x10
     };
     ,   OBSERVE_DidSendAction       = 0x08
     ,   OBSERVE_WillSendAction      = 0x10
     };

+    virtual void Cocoa_dealloc() {}

     virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 43108ad7d692e524959302c2687766bc492dcfbf..c71a2d2e9b1bf55f50555081f30a37818800820b 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -16,12 +16,11 @@
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/NSMenu.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/NSMenu.h"

-//#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/ObjcPose.h"

 
 #import <Foundation/NSNotification.h>
 #import <AppKit/NSMenu.h>
 
 
 #import <Foundation/NSNotification.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
 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @implementation wxPoserNSMenu : NSMenu
 
 @end // wxPoserNSMenu
 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @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