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

factoring common code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-04 10:28:11 +00:00
parent 7063c559ec
commit 6c2324fa9c
1 changed files with 3 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,75 +650,11 @@ static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handl
switch ( cEvent.GetKind() ) switch ( cEvent.GetKind() )
{ {
case kEventProcessCommand : case kEventProcessCommand :
{ result = itemMenu->MacHandleCommandProcess( item, id, focus );
// HiliteMenu(0);
if (item->IsCheckable())
item->Check( !item->IsChecked() ) ;
if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
result = noErr ;
else
{
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , id);
event.SetEventObject(focus);
event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
if ( focus->GetEventHandler()->ProcessEvent(event) )
result = noErr ;
}
}
break ; break ;
case kEventCommandUpdateStatus: case kEventCommandUpdateStatus:
{ result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus );
wxUpdateUIEvent event(id);
event.SetEventObject( itemMenu );
bool processed = false;
// Try the menu's event handler
{
wxEvtHandler *handler = itemMenu->GetEventHandler();
if ( handler )
processed = handler->ProcessEvent(event);
}
// Try the window the menu was popped up from
// (and up through the hierarchy)
if ( !processed )
{
const wxMenuBase *menu = itemMenu;
while ( menu )
{
wxWindow *win = menu->GetInvokingWindow();
if ( win )
{
processed = win->GetEventHandler()->ProcessEvent(event);
break;
}
menu = menu->GetParent();
}
}
if ( !processed )
{
processed = focus->GetEventHandler()->ProcessEvent(event);
}
if ( processed )
{
// if anything changed, update the changed attribute
if (event.GetSetText())
itemMenu->SetLabel(id, event.GetText());
if (event.GetSetChecked())
itemMenu->Check(id, event.GetChecked());
if (event.GetSetEnabled())
itemMenu->Enable(id, event.GetEnabled());
result = noErr ;
}
}
break ; break ;
default : default :