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

removed #if KEY_wxList_DEPRECATED: as KEY_wxList_DEPRECATED is not defined anywhere, this doesn't do anything but provoke gcc warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-08 21:51:32 +00:00
parent de1b0aeb6c
commit 1fc0b5afe7
3 changed files with 0 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mac/carbon/menu.cpp
View File

@@ -49,34 +49,6 @@ const short kwxMacAppleMenuId = 1 ;
// Find an item given the Macintosh Menu Reference
#if KEY_wxList_DEPRECATED
wxList wxWinMacMenuList(wxKEY_INTEGER);
wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef)
{
wxNode *node = wxWinMacMenuList.Find((long)inMenuRef);
if (!node)
return NULL;
return (wxMenu *)node->GetData();
}
void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ;
void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu)
{
// adding NULL MenuRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") );
if ( !wxWinMacMenuList.Find((long)inMenuRef) )
wxWinMacMenuList.Append((long)inMenuRef, menu);
}
void wxRemoveMacMenuAssociation(wxMenu *menu) ;
void wxRemoveMacMenuAssociation(wxMenu *menu)
{
wxWinMacMenuList.DeleteObject(menu);
}
#else
WX_DECLARE_HASH_MAP(MenuRef, wxMenu*, wxPointerHash, wxPointerEqual, MacMenuMap);
static MacMenuMap wxWinMacMenuList;
@@ -112,7 +84,6 @@ void wxRemoveMacMenuAssociation(wxMenu *menu)
}
}
}
#endif // deprecated wxList
// ============================================================================
// implementation