Use wxString::t_str() in calls to Windows API functions in wxMSW.

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

diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h
index 1b2e20eb74f716f31c80abeca8b63788d74b5722..51d49c7964e1e3241dd3b3f7320f94e2a48efbf1 100644 (file)
--- a/include/wx/ribbon/panel.h
+++ b/include/wx/ribbon/panel.h
@@ -20,11 +20,13 @@
 
 enum wxRibbonPanelOption
 {
 
 enum wxRibbonPanelOption
 {

-    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_NO_AUTO_MINIMISE = 1 << 0,
+    wxRIBBON_PANEL_EXT_BUTTON       = 1 << 3,
+    wxRIBBON_PANEL_MINIMISE_BUTTON  = 1 << 4,
+    wxRIBBON_PANEL_STRETCH          = 1 << 5,
+    wxRIBBON_PANEL_FLEXIBLE         = 1 << 6,
+
+    wxRIBBON_PANEL_DEFAULT_STYLE    = 0

 };
 
 class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl
 };
 
 class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl


@@ -74,8 +76,15 @@ public:
     wxRibbonPanel* GetExpandedDummy();
     wxRibbonPanel* GetExpandedPanel();
 
     wxRibbonPanel* GetExpandedDummy();
     wxRibbonPanel* GetExpandedPanel();
 

+    // Finds the best width and height given the parent's width and height
+    virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const;
+
+    long GetFlags() { return m_flags; }
+

 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;