Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing...

[wxWidgets.git] / src / cocoa / NSMenu.mm

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 60792740f4a5c8f62d7ae8e969bd857b1cf19d0a..635b2ee96eef23eca7cc52aa3974ddfb44364e3b 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -16,26 +16,26 @@
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/NSMenu.h"
-//#include "wx/cocoa/ObjcPose.h"
 
 #import <Foundation/NSNotification.h>
-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"
 
-#if 0 // There is no reason to pose for NSMenu at this time.
 // ============================================================================
-// @class wxPoserNSMenu
+// @class WXNSMenu
 // ============================================================================
-@interface wxPoserNSMenu : NSMenu
-{
-}
 
-@end // wxPoserNSMenu
+@implementation WXNSMenu : NSMenu
 
-WX_IMPLEMENT_POSER(wxPoserNSMenu);
-@implementation wxPoserNSMenu : NSMenu
+- (void)dealloc
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
+    if(menu)
+        menu->Cocoa_dealloc();
+    [super dealloc];
+}
 
-@end // wxPoserNSMenu
-#endif // 0
+@end // WXNSMenu
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSMenu,NSMenu)
 
 // ============================================================================
 // @class wxNSMenuNotificationObserver
@@ -44,14 +44,13 @@ WX_IMPLEMENT_POSER(wxPoserNSMenu);
 {
 }
 
-struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObserver alloc] init];
-
 - (void)menuDidAddItem: (NSNotification *)notification;
 - (void)menuDidChangeItem: (NSNotification *)notification;
 - (void)menuDidRemoveItem: (NSNotification *)notification;
 - (void)menuDidSendAction: (NSNotification *)notification;
 - (void)menuWillSendAction: (NSNotification *)notification;
 @end // interface wxNSMenuNotificationObserver
+WX_DECLARE_GET_OBJC_CLASS(wxNSMenuNotificationObserver,NSObject)
 
 @implementation wxNSMenuNotificationObserver : NSObject
 
@@ -91,12 +90,15 @@ struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObse
 }
 
 @end // implementation wxNSMenuNotificationObserver
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuNotificationObserver,NSObject)
 
 // ========================================================================
 // wxCocoaNSMenu
 // ========================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
 
+struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[WX_GET_OBJC_CLASS(wxNSMenuNotificationObserver) alloc] init];
+
 void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags)
 {
     if(cocoaNSMenu)