fixing warning and compile error against 10.4

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

diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h
index 1b2e20eb74f716f31c80abeca8b63788d74b5722..0c9f5f887fc9f34e2385967a0ed8ca0b679c055f 100644 (file)
--- a/include/wx/ribbon/panel.h
+++ b/include/wx/ribbon/panel.h
@@ -23,7 +23,7 @@ enum wxRibbonPanelOption
     wxRIBBON_PANEL_NO_AUTO_MINIMISE    = 1 << 0,
     wxRIBBON_PANEL_EXT_BUTTON        = 1 << 3,
     wxRIBBON_PANEL_MINIMISE_BUTTON    = 1 << 4,
     wxRIBBON_PANEL_NO_AUTO_MINIMISE    = 1 << 0,
     wxRIBBON_PANEL_EXT_BUTTON        = 1 << 3,
     wxRIBBON_PANEL_MINIMISE_BUTTON    = 1 << 4,

-    
+

     wxRIBBON_PANEL_DEFAULT_STYLE = 0,
 };
 
     wxRIBBON_PANEL_DEFAULT_STYLE = 0,
 };
 


@@ -76,6 +76,8 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+    virtual wxSize GetPanelSizerBestSize() const;
+    wxSize  GetPanelSizerMinSize() const;

     wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     wxSize GetMinNotMinimisedSize() const;
 
     wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     wxSize GetMinNotMinimisedSize() const;