diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index f503a86011..009efb04a4 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -44,8 +44,8 @@ public: // implementation only from now on // ------------------------------- - bool HandleCommandUpdateStatus( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); - bool HandleCommandProcess( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); + bool HandleCommandUpdateStatus( wxMenuItem* menuItem ); + bool HandleCommandProcess( wxMenuItem* menuItem ); void HandleMenuItemHighlighted( wxMenuItem* menuItem ); void HandleMenuOpened(); void HandleMenuClosed(); diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp index 85bcdf44bc..e70899b881 100644 --- a/src/osx/menu_osx.cpp +++ b/src/osx/menu_osx.cpp @@ -318,7 +318,7 @@ void wxMenu::DoRearrange() } -bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow ) +bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item ) { int menuid = item ? item->GetId() : 0; wxUpdateUIEvent event(menuid); @@ -329,11 +329,6 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow bool processed = DoProcessEvent(this, event, GetWindow()); - if ( !processed && senderWindow != NULL) - { - processed = senderWindow->HandleWindowEvent(event); - } - if ( processed ) { // if anything changed, update the changed attribute @@ -348,7 +343,7 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow return processed; } -bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow ) +bool wxMenu::HandleCommandProcess( wxMenuItem* item ) { int menuid = item ? item->GetId() : 0; bool processed = false; @@ -357,18 +352,6 @@ bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow ) if ( SendEvent( menuid , item->IsCheckable() ? item->IsChecked() : -1 ) ) processed = true ; - else - { - if ( senderWindow != NULL ) - { - wxCommandEvent event(wxEVT_MENU , menuid); - event.SetEventObject(this); - event.SetInt(item->IsCheckable() ? item->IsChecked() : -1); - - if ( senderWindow->HandleWindowEvent(event) ) - processed = true ; - } - } if(!processed && item) {