Implement wxStackWalker for wxMSW under x86-64.

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

diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h
index d36c82af28e79eeb693fb28bb2d6146e61a1ba5c..83add15ef30dd28556826561527c0a931b9e3b61 100644 (file)
--- a/include/wx/ribbon/panel.h
+++ b/include/wx/ribbon/panel.h
@@ -23,8 +23,8 @@ 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

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


@@ -65,7 +65,6 @@ public:
     virtual bool Realize();
     virtual bool Layout();
     virtual wxSize GetMinSize() const;
     virtual bool Realize();
     virtual bool Layout();
     virtual wxSize GetMinSize() const;

-    virtual wxSize DoGetBestSize() const;

 
     virtual bool IsSizingContinuous() const;
 
 
     virtual bool IsSizingContinuous() const;
 


@@ -76,6 +75,9 @@ public:
     wxRibbonPanel* GetExpandedPanel();
 
 protected:
     wxRibbonPanel* GetExpandedPanel();
 
 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;