Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ability to observe NSMenu notifications

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-09-05 14:50:31 +00:00
parent 061174e31a
commit bcf0148786
2 changed files with 110 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/cocoa/NSMenu.h
View File

@@ -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_

92
src/cocoa/NSMenu.mm
View File

@@ -18,6 +18,9 @@
#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
@@ -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