compilation fix after r61232

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 635b2ee96eef23eca7cc52aa3974ddfb44364e3b..c59ee77a0a815654aee2123e51bef768b807e5b9 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -15,6 +15,7 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

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

 #include "wx/cocoa/NSMenu.h"
 
 #import <Foundation/NSNotification.h>
 #include "wx/cocoa/NSMenu.h"
 
 #import <Foundation/NSNotification.h>


@@ -97,7 +98,10 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuNotificationObserver,NSObject)
 // ========================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
 
 // ========================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
 

-struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[WX_GET_OBJC_CLASS(wxNSMenuNotificationObserver) alloc] init];
+// 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)
 {
 
 void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags)
 {