Fix wxLaunchDefaultBrowser on wxMSW for local files/directories: the bug could be...

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 43108ad7d692e524959302c2687766bc492dcfbf..c59ee77a0a815654aee2123e51bef768b807e5b9 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -15,27 +15,28 @@
     #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"

 
 

-#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
 
 // ============================================================================
 // @class wxNSMenuNotificationObserver


@@ -44,14 +45,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
 


@@ -91,12 +91,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)