destroying native and wx controls

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index be8e5417355fedf682f7b609ee0a4e718dbeb047..c71a2d2e9b1bf55f50555081f30a37818800820b 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,12 +16,11 @@
 #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>
 
-#if 0 // There is no reason to pose for NSMenu at this time.
 // ============================================================================
 // @class wxPoserNSMenu
 // ============================================================================
@@ -29,13 +28,21 @@
 {
 }
 
+- (void)dealloc;
+
 @end // wxPoserNSMenu
 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @implementation wxPoserNSMenu : NSMenu
 
+- (void)dealloc
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
+    if(menu)
+        menu->Cocoa_dealloc();
+}
+
 @end // wxPoserNSMenu
-#endif // 0
 
 // ============================================================================
 // @class wxNSMenuNotificationObserver
@@ -58,35 +65,35 @@ struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObse
 - (void)menuDidAddItem: (NSNotification *)notification
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
-    wxCHECK_RET(menu,"menuDidAddItem received but no wxMenu exists");
+    wxCHECK_RET(menu,wxT("menuDidAddItem received but no wxMenu exists"));
     menu->CocoaNotification_menuDidAddItem(notification);
 }
 
 - (void)menuDidChangeItem: (NSNotification *)notification
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
-    wxCHECK_RET(menu,"menuDidChangeItem received but no wxMenu exists");
+    wxCHECK_RET(menu,wxT("menuDidChangeItem received but no wxMenu exists"));
     menu->CocoaNotification_menuDidChangeItem(notification);
 }
 
 - (void)menuDidRemoveItem: (NSNotification *)notification
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
-    wxCHECK_RET(menu,"menuDidRemoveItem received but no wxMenu exists");
+    wxCHECK_RET(menu,wxT("menuDidRemoveItem received but no wxMenu exists"));
     menu->CocoaNotification_menuDidRemoveItem(notification);
 }
 
 - (void)menuDidSendAction: (NSNotification *)notification
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
-    wxCHECK_RET(menu,"menuDidSendAction received but no wxMenu exists");
+    wxCHECK_RET(menu,wxT("menuDidSendAction received but no wxMenu exists"));
     menu->CocoaNotification_menuDidSendAction(notification);
 }
 
 - (void)menuWillSendAction: (NSNotification *)notification
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
-    wxCHECK_RET(menu,"menuWillSendAction received but no wxMenu exists");
+    wxCHECK_RET(menu,wxT("menuWillSendAction received but no wxMenu exists"));
     menu->CocoaNotification_menuWillSendAction(notification);
 }