supporting PopUp on osx cocoa as well, see #10361

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-01-10 14:43:22 +00:00
parent 5e2ab81dbc
commit 2cb5d2d2b7
4 changed files with 39 additions and 24 deletions

View File

@@ -748,30 +748,8 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
ClientToScreen( &x , &y ) ;
}
#ifdef __WXOSX_CARBON__
long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
if ( HiWord(menuResult) != 0 )
{
MenuCommand macid;
GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
int id = wxMacCommandToId( macid );
wxMenuItem* item = NULL ;
wxMenu* realmenu ;
item = menu->FindItem( id, &realmenu ) ;
if ( item )
{
if (item->IsCheckable())
item->Check( !item->IsChecked() ) ;
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
}
#else
menu->GetPeer()->PopUp(this, x, y);
menu->SetInvokingWindow( NULL );
return false;
#endif
return true;
#else
// actually this shouldn't be called, because universal is having its own implementation