X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78f933650057d0e09ee06b59f7d23cb83b48e1b3..8605eb1abe7a3cf3564baa351af8ec9323665da3:/src/univ/menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 22949bed1d..e8916af3a8 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -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);