make access specifiers for the virtual functions match their access in the base class (patch 1400131)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -127,9 +127,6 @@ public:
|
||||
// override the base class version to dismiss any open submenus
|
||||
virtual void Dismiss();
|
||||
|
||||
// notify the menu when the window disappears from screen
|
||||
virtual void OnDismiss();
|
||||
|
||||
// called when a submenu is dismissed
|
||||
void OnSubmenuDismiss(bool dismissParent);
|
||||
|
||||
@@ -164,6 +161,8 @@ public:
|
||||
// don't dismiss the popup window if the parent menu was clicked
|
||||
virtual bool ProcessLeftDown(wxMouseEvent& event);
|
||||
|
||||
virtual bool SetCurrent(bool doit = true) { return wxPopupTransientWindow::SetCurrent(doit); };
|
||||
|
||||
protected:
|
||||
// how did we perform this operation?
|
||||
enum InputMethod
|
||||
@@ -172,6 +171,9 @@ protected:
|
||||
WithMouse
|
||||
};
|
||||
|
||||
// notify the menu when the window disappears from screen
|
||||
virtual void OnDismiss();
|
||||
|
||||
// draw the menu inside this window
|
||||
virtual void DoDraw(wxControlRenderer *renderer);
|
||||
|
||||
@@ -186,7 +188,6 @@ protected:
|
||||
|
||||
// set the current node and item withotu refreshing anything
|
||||
void SetCurrent(wxMenuItemList::compatibility_iterator node);
|
||||
virtual bool SetCurrent(bool doit = true){return wxPopupTransientWindow::SetCurrent(doit);};
|
||||
|
||||
// change the current item refreshing the old and new items
|
||||
void ChangeCurrent(wxMenuItemList::compatibility_iterator node);
|
||||
|
Reference in New Issue
Block a user