removed src/gtk/eggtrayicon.h

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index 45089152892c8aba695823dedc6af1dc8daca814..c71a2d2e9b1bf55f50555081f30a37818800820b 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -4,37 +4,23 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 #include "wx/wxprec.h"
+#if wxUSE_MENUS
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/NSMenu.h"
 #include "wx/cocoa/ObjcPose.h"
-#include "wx/cocoa/autorelease.h"
 
-#import <Foundation/NSString.h>
+#import <Foundation/NSNotification.h>
 #import <AppKit/NSMenu.h>
 
-#if wxUSE_MENUS
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
 // ============================================================================
 // @class wxPoserNSMenu
 // ============================================================================
@@ -42,27 +28,111 @@
 {
 }
 
+- (void)dealloc;
+
 @end // wxPoserNSMenu
 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @implementation wxPoserNSMenu : NSMenu
 
+- (void)dealloc
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
+    if(menu)
+        menu->Cocoa_dealloc();
+}
+
 @end // wxPoserNSMenu
 
 // ============================================================================
-// wxCocoaNSMenu implementation
+// @class wxNSMenuNotificationObserver
 // ============================================================================
-bool wxCocoaNSMenu::CocoaCreate(const wxString &title)
+@interface wxNSMenuNotificationObserver : NSObject
+{
+}
+
+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
+
+@implementation wxNSMenuNotificationObserver : NSObject
+
+- (void)menuDidAddItem: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,wxT("menuDidAddItem received but no wxMenu exists"));
+    menu->CocoaNotification_menuDidAddItem(notification);
+}
+
+- (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
+
+// ========================================================================
+// wxCocoaNSMenu
+// ========================================================================
+WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu)
+
+void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags)
 {
-    wxAutoNSAutoreleasePool pool;
-    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