From bcf014878689fa97b8c67372ad616a398b245807 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 5 Sep 2003 14:50:31 +0000 Subject: [PATCH] Added ability to observe NSMenu notifications git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/NSMenu.h | 19 +++++++- src/cocoa/NSMenu.mm | 92 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h index 354d4738d4..c0ce05205e 100644 --- a/include/wx/cocoa/NSMenu.h +++ b/include/wx/cocoa/NSMenu.h @@ -23,7 +23,24 @@ WX_DECLARE_OBJC_HASHMAP(NSMenu); class wxCocoaNSMenu { - WX_DECLARE_OBJC_INTERFACE(NSMenu) + WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSMenu) +public: + void AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags = 0); + void DisassociateNSMenu(WX_NSMenu cocoaNSMenu); + enum + { OBSERVE_DidAddItem = 0x01 + , OBSERVE_DidChangeItem = 0x02 + , OBSERVE_DidRemoveItem = 0x04 + , OBSERVE_DidSendAction = 0x08 + , OBSERVE_WillSendAction = 0x10 + }; + void CocoaNotification_menuDidAddItem(WX_NSNotification userInfo) {} + void CocoaNotification_menuDidChangeItem(WX_NSNotification userInfo) {} + void CocoaNotification_menuDidRemoveItem(WX_NSNotification userInfo) {} + void CocoaNotification_menuDidSendAction(WX_NSNotification userInfo) {} + void CocoaNotification_menuWillSendAction(WX_NSNotification userInfo) {} +protected: + static struct objc_object *sm_cocoaObserver; }; #endif // _WX_COCOA_NSMENU_H_ diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm index bbf68e96d5..ca226efa44 100644 --- a/src/cocoa/NSMenu.mm +++ b/src/cocoa/NSMenu.mm @@ -18,6 +18,9 @@ #include "wx/cocoa/NSMenu.h" //#include "wx/cocoa/ObjcPose.h" +#import +#import + #if 0 // There is no reason to pose for NSMenu at this time. // ============================================================================ // @class wxPoserNSMenu @@ -34,4 +37,93 @@ WX_IMPLEMENT_POSER(wxPoserNSMenu); @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 +// ======================================================================== +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 -- 2.47.2