Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index ef19045c4502460691423c933cd81fc892bb6157..fae4e995a2bc52c714ffa9666e0d731b3e5a70d2 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSMenu.mm
+// Name:        src/cocoa/NSMenu.mm

 // Purpose:     wxCocoaNSMenu implementation
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
 // Purpose:     wxCocoaNSMenu implementation
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

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

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


@@ -15,25 +14,17 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

+#include "wx/cocoa/ObjcRef.h"

 #include "wx/cocoa/NSMenu.h"
 #include "wx/cocoa/NSMenu.h"

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

 
 #import <Foundation/NSNotification.h>
 
 #import <Foundation/NSNotification.h>

-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"

 
 // ============================================================================
 
 // ============================================================================

-// @class wxPoserNSMenu
+// @class WXNSMenu

 // ============================================================================
 // ============================================================================

-@interface wxPoserNSMenu : NSMenu
-{
-}
-
-- (void)dealloc;

 
 

-@end // wxPoserNSMenu
-
-WX_IMPLEMENT_POSER(wxPoserNSMenu);
-@implementation wxPoserNSMenu : NSMenu
+@implementation WXNSMenu : NSMenu

 
 - (void)dealloc
 {
 
 - (void)dealloc
 {


@@ -43,7 +34,8 @@ WX_IMPLEMENT_POSER(wxPoserNSMenu);
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-@end // wxPoserNSMenu
+@end // WXNSMenu
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSMenu,NSMenu)

 
 // ============================================================================
 // @class wxNSMenuNotificationObserver
 
 // ============================================================================
 // @class wxNSMenuNotificationObserver


@@ -52,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
 - (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
 
 
 @implementation wxNSMenuNotificationObserver : NSObject
 


@@ -99,12 +90,18 @@ struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObse
 }
 
 @end // implementation wxNSMenuNotificationObserver
 }
 
 @end // implementation wxNSMenuNotificationObserver

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuNotificationObserver,NSObject)

 
 // ========================================================================
 // wxCocoaNSMenu
 // ========================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
 
 
 // ========================================================================
 // wxCocoaNSMenu
 // ========================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
 

+// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with)
+static wxObjcAutoRefFromAlloc<wxNSMenuNotificationObserver*> s_cocoaNSMenuObserver([[WX_GET_OBJC_CLASS(wxNSMenuNotificationObserver) alloc] init]);
+// For compatibility with old code
+struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = s_cocoaNSMenuObserver;
+

 void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags)
 {
     if(cocoaNSMenu)
 void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags)
 {
     if(cocoaNSMenu)