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

Remove unused senderWindow argument of wxMenu::HandleCommandXXX()

Browse Source 
This parameter isn't used anywhere, so just remove it to simplify the
code.
This commit is contained in:
Vadim Zeitlin
2021-04-04 14:29:34 +02:00
parent 0f1d1d2ae9
commit 9c1c4817db
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/menu.h
View File

@@ -44,8 +44,8 @@ public:
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
bool HandleCommandUpdateStatus( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); bool HandleCommandUpdateStatus( wxMenuItem* menuItem );
bool HandleCommandProcess( wxMenuItem* menuItem, wxWindow* senderWindow = NULL); bool HandleCommandProcess( wxMenuItem* menuItem );
void HandleMenuItemHighlighted( wxMenuItem* menuItem ); void HandleMenuItemHighlighted( wxMenuItem* menuItem );
void HandleMenuOpened(); void HandleMenuOpened();
void HandleMenuClosed(); void HandleMenuClosed();

21
src/osx/menu_osx.cpp
View File

@@ -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; int menuid = item ? item->GetId() : 0;
wxUpdateUIEvent event(menuid); wxUpdateUIEvent event(menuid);
@@ -329,11 +329,6 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow
bool processed = DoProcessEvent(this, event, GetWindow()); bool processed = DoProcessEvent(this, event, GetWindow());
if ( !processed && senderWindow != NULL)
{
processed = senderWindow->HandleWindowEvent(event);
}
if ( processed ) if ( processed )
{ {
// if anything changed, update the changed attribute // if anything changed, update the changed attribute
@@ -348,7 +343,7 @@ bool wxMenu::HandleCommandUpdateStatus( wxMenuItem* item, wxWindow* senderWindow
return processed; return processed;
} }
bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow ) bool wxMenu::HandleCommandProcess( wxMenuItem* item )
{ {
int menuid = item ? item->GetId() : 0; int menuid = item ? item->GetId() : 0;
bool processed = false; bool processed = false;
@@ -357,18 +352,6 @@ bool wxMenu::HandleCommandProcess( wxMenuItem* item, wxWindow* senderWindow )
if ( SendEvent( menuid , item->IsCheckable() ? item->IsChecked() : -1 ) ) if ( SendEvent( menuid , item->IsCheckable() ? item->IsChecked() : -1 ) )
processed = true ; 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) if(!processed && item)
{ {