Also add wxNativeFontInfo::SetStrikethrough() stub for wxGTK2.

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index a930b8a4dee7b0b3d6dda890096b35da8a9fe02d..4060f544a5d62a037e4225286a66779112f14557 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -1,66 +1,137 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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: 
+// RCS-ID:      $Id$

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

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

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

+#if wxUSE_MENUS

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
 #ifndef 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/NSString.h>
-#import <AppKit/NSMenu.h>
+#import <Foundation/NSNotification.h>
+#include "wx/cocoa/objc/NSMenu.h"

 
 

-#if wxUSE_MENUS
+// ============================================================================
+// @class WXNSMenu
+// ============================================================================

 
 

-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
+@implementation WXNSMenu : NSMenu
+
+- (void)dealloc
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
+    if(menu)
+        menu->Cocoa_dealloc();
+    [super dealloc];
+}
+
+@end // WXNSMenu
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSMenu,NSMenu)

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

-// @class wxPoserNSMenu
+// @class wxNSMenuNotificationObserver

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

-@interface wxPoserNSMenu : NSMenu
+@interface wxNSMenuNotificationObserver : NSObject

 {
 }
 
 {
 }
 

-@end // wxPoserNSMenu
+- (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)

 
 

-WX_IMPLEMENT_POSER(wxPoserNSMenu);
-@implementation wxPoserNSMenu : NSMenu
+@implementation wxNSMenuNotificationObserver : NSObject

 
 

-@end // wxPoserNSMenu
+- (void)menuDidAddItem: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,wxT("menuDidAddItem received but no wxMenu exists"));
+    menu->CocoaNotification_menuDidAddItem(notification);
+}

 
 

-// ============================================================================
-// wxCocoaNSMenu implementation
-// ============================================================================
-bool wxCocoaNSMenu::CocoaCreate(const wxString &title)
+- (void)menuDidChangeItem: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    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,wxT("menuDidRemoveItem received but no wxMenu exists"));
+    menu->CocoaNotification_menuDidRemoveItem(notification);
+}
+
+- (void)menuDidSendAction: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    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,wxT("menuWillSendAction received but no wxMenu exists"));
+    menu->CocoaNotification_menuWillSendAction(notification);
+}
+
+@end // implementation wxNSMenuNotificationObserver
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuNotificationObserver,NSObject)
+
+// ========================================================================
+// 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)

 {
 {

-    wxLogDebug("CocoaCreate: "+title);
-    m_cocoaNSMenu = [[NSMenu alloc] initWithTitle: [NSString stringWithCString: title.c_str()]];
-    return true;
+    if(cocoaNSMenu)
+    {
+        sm_cocoaHash.insert(wxCocoaNSMenuHash::value_type(cocoaNSMenu,this));
+        if(flags&OBSERVE_DidAddItem)
+            [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(menuDidAddItem:) name:NSMenuDidAddItemNotification object:cocoaNSMenu];
+        if(flags&OBSERVE_DidChangeItem)
+            [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(menuDidChangeItem:) name:NSMenuDidChangeItemNotification object:cocoaNSMenu];
+        if(flags&OBSERVE_DidRemoveItem)
+            [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(menuDidRemoveItem:) name:NSMenuDidRemoveItemNotification object:cocoaNSMenu];
+        if(flags&OBSERVE_DidSendAction)
+            [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(menuDidSendAction:) name:NSMenuDidSendActionNotification object:cocoaNSMenu];
+        if(flags&OBSERVE_WillSendAction)
+            [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(menuWillSendAction:) name:NSMenuWillSendActionNotification object:cocoaNSMenu];
+    }

 }
 
 }
 

-wxCocoaNSMenu::~wxCocoaNSMenu()
+void wxCocoaNSMenu::DisassociateNSMenu(WX_NSMenu cocoaNSMenu)

 {
 {

-    [m_cocoaNSMenu release];
+    if(cocoaNSMenu)
+    {
+        sm_cocoaHash.erase(cocoaNSMenu);
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:NSMenuDidAddItemNotification object:cocoaNSMenu];
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:NSMenuDidChangeItemNotification object:cocoaNSMenu];
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:NSMenuDidRemoveItemNotification object:cocoaNSMenu];
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:NSMenuDidSendActionNotification object:cocoaNSMenu];
+        [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:NSMenuWillSendActionNotification object:cocoaNSMenu];
+    }

 }
 
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS