X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcf014878689fa97b8c67372ad616a398b245807..3ca4086b22723db16d7e0fc23aa9021b4785096a:/src/cocoa/NSMenu.mm diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm index ca226efa44..60792740f4 100644 --- a/src/cocoa/NSMenu.mm +++ b/src/cocoa/NSMenu.mm @@ -58,35 +58,35 @@ struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObse - (void)menuDidAddItem: (NSNotification *)notification { wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa([notification object]); - wxCHECK_RET(menu,"menuDidAddItem received but no wxMenu exists"); + 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,"menuDidChangeItem received but no wxMenu exists"); + 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,"menuDidRemoveItem received but no wxMenu exists"); + 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,"menuDidSendAction received but no wxMenu exists"); + 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,"menuWillSendAction received but no wxMenu exists"); + wxCHECK_RET(menu,wxT("menuWillSendAction received but no wxMenu exists")); menu->CocoaNotification_menuWillSendAction(notification); } @@ -95,6 +95,8 @@ struct objc_object *wxCocoaNSMenu::sm_cocoaObserver = [[wxNSMenuNotificationObse // ======================================================================== // wxCocoaNSMenu // ======================================================================== +WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSMenu) + void wxCocoaNSMenu::AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags) { if(cocoaNSMenu)