Build fix for wxOSX after the changes of r78230.
Fix wrong signature of DoHandleMenuEvent() by getting rid of this function entirely, it's not just a trivial wrapper for ProcessMenuEvent() anyhow, so just use the latter directly. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -65,7 +65,6 @@ protected:
|
||||
// that are expected in the app menu
|
||||
void DoRearrange() ;
|
||||
|
||||
bool DoHandleMenuEvent( wxEvent& evt );
|
||||
virtual wxMenuItem* DoAppend(wxMenuItem *item);
|
||||
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
|
||||
virtual wxMenuItem* DoRemove(wxMenuItem *item);
|
||||
|
@@ -529,7 +529,7 @@ void wxMenu::HandleMenuItemHighlighted( wxMenuItem* item )
|
||||
{
|
||||
int menuid = item ? item->GetId() : 0;
|
||||
wxMenuEvent wxevent(wxEVT_MENU_HIGHLIGHT, menuid, this);
|
||||
DoHandleMenuEvent( wxevent );
|
||||
ProcessMenuEvent(this, wxevent, GetWindow());
|
||||
}
|
||||
|
||||
void wxMenu::DoHandleMenuOpenedOrClosed(wxEventType evtType)
|
||||
@@ -540,7 +540,7 @@ void wxMenu::DoHandleMenuOpenedOrClosed(wxEventType evtType)
|
||||
// Set the id to allow wxMenuEvent::IsPopup() to work correctly.
|
||||
int menuid = this == wxCurrentPopupMenu ? wxID_ANY : 0;
|
||||
wxMenuEvent wxevent(evtType, menuid, this);
|
||||
DoHandleMenuEvent( wxevent );
|
||||
ProcessMenuEvent(this, wxevent, GetWindow());
|
||||
}
|
||||
|
||||
void wxMenu::HandleMenuOpened()
|
||||
@@ -553,11 +553,6 @@ void wxMenu::HandleMenuClosed()
|
||||
DoHandleMenuOpenedOrClosed(wxEVT_MENU_CLOSE);
|
||||
}
|
||||
|
||||
bool wxMenu::DoHandleMenuEvent(wxEvent& wxevent)
|
||||
{
|
||||
return ProcessMenuEvent(this, wxevent, GetWindow());
|
||||
}
|
||||
|
||||
// Menu Bar
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user