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

converting menu ids and safeguarding against missing menu items

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-01-28 12:28:56 +00:00
parent c137ddc91f
commit e8027adbb6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mac/carbon/window.cpp
View File

@@ -1665,15 +1665,19 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ; long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
if ( HiWord(menuResult) != 0 ) if ( HiWord(menuResult) != 0 )
{ {
MenuCommand id ; MenuCommand macid;
GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ; GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
int id = wxMacCommandToId( macid );
wxMenuItem* item = NULL ; wxMenuItem* item = NULL ;
wxMenu* realmenu ; wxMenu* realmenu ;
item = menu->FindItem( id, &realmenu ) ; item = menu->FindItem( id, &realmenu ) ;
if (item->IsCheckable()) if ( item )
item->Check( !item->IsChecked() ) ; {
if (item->IsCheckable())
item->Check( !item->IsChecked() ) ;
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
} }
menu->MacAfterDisplay( true ) ; menu->MacAfterDisplay( true ) ;