Fixed a long-standing issue where wxSlider controls with a hardcoded size would mispl...

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 60792740f4a5c8f62d7ae8e969bd857b1cf19d0a..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
 // Created:     2002/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -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