Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

[wxWidgets.git] / include / wx / ribbon / bar.h

diff --git a/include/wx/ribbon/bar.h b/include/wx/ribbon/bar.h
index 39752c7c58f9fba95797c9e2acbe9c481098120f..4f62dbadd9361d03d1b3a770b074fde95ea9cc92 100644 (file)
--- a/include/wx/ribbon/bar.h
+++ b/include/wx/ribbon/bar.h
@@ -115,7 +115,6 @@ public:
     wxRibbonPage* GetPage(int n);
     bool DismissExpandedPanel();
 
     wxRibbonPage* GetPage(int n);
     bool DismissExpandedPanel();
 

-    virtual wxSize DoGetBestSize() const;

     virtual bool HasMultiplePages() const { return true; }
 
     void SetWindowStyleFlag(long style);
     virtual bool HasMultiplePages() const { return true; }
 
     void SetWindowStyleFlag(long style);


@@ -125,6 +124,7 @@ public:
 protected:
     friend class wxRibbonPage;
 
 protected:
     friend class wxRibbonPage;
 

+    virtual wxSize DoGetBestSize() const;

     wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL);
 
     wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL);