removed assert which became incorrect after last change

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index bbf68e96d58065f6832891e83ede6ea62fa495cd..be8e5417355fedf682f7b609ee0a4e718dbeb047 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -18,6 +18,9 @@
 #include "wx/cocoa/NSMenu.h"
 //#include "wx/cocoa/ObjcPose.h"
 
 #include "wx/cocoa/NSMenu.h"
 //#include "wx/cocoa/ObjcPose.h"
 

+#import <Foundation/NSNotification.h>
+#import <AppKit/NSMenu.h>
+

 #if 0 // There is no reason to pose for NSMenu at this time.
 // ============================================================================
 // @class wxPoserNSMenu
 #if 0 // There is no reason to pose for NSMenu at this time.
 // ============================================================================
 // @class wxPoserNSMenu


@@ -34,4 +37,95 @@ WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @end // wxPoserNSMenu
 #endif // 0
 
 @end // wxPoserNSMenu
 #endif // 0
 

+// ============================================================================
+// @class wxNSMenuNotificationObserver
+// ============================================================================
+@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,"menuDidAddItem received but no wxMenu exists");
+    menu->CocoaNotification_menuDidAddItem(notification);
+}
+
+- (void)menuDidChangeItem: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,"menuDidChangeItem received but no wxMenu exists");
+    menu->CocoaNotification_menuDidChangeItem(notification);
+}
+
+- (void)menuDidRemoveItem: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,"menuDidRemoveItem received but no wxMenu exists");
+    menu->CocoaNotification_menuDidRemoveItem(notification);
+}
+
+- (void)menuDidSendAction: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,"menuDidSendAction received but no wxMenu exists");
+    menu->CocoaNotification_menuDidSendAction(notification);
+}
+
+- (void)menuWillSendAction: (NSNotification *)notification
+{
+    wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]);
+    wxCHECK_RET(menu,"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)
+{
+    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];
+    }
+}
+
+void wxCocoaNSMenu::DisassociateNSMenu(WX_NSMenu cocoaNSMenu)
+{
+    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