removing outdated code

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

diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h
index 80d8e6f1cfa2fd8c87ed8c8a897dcb826a2dfc8b..5d3fed58c32bff0a9d2e69d0412b5235dad58ca9 100644 (file)
--- a/include/wx/ribbon/page.h
+++ b/include/wx/ribbon/page.h
@@ -46,7 +46,6 @@ public:
 
     wxBitmap& GetIcon() {return m_icon;}
     virtual wxSize GetMinSize() const;
 
     wxBitmap& GetIcon() {return m_icon;}
     virtual wxSize GetMinSize() const;

-    virtual wxSize DoGetBestSize() const;

     void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height);
     void AdjustRectToIncludeScrollButtons(wxRect* rect) const;
 
     void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height);
     void AdjustRectToIncludeScrollButtons(wxRect* rect) const;
 


@@ -62,10 +61,14 @@ public:
 
     virtual void RemoveChild(wxWindowBase *child);
 
 
     virtual void RemoveChild(wxWindowBase *child);
 

+    void HideIfExpanded();
+

 protected:
 protected:

+    virtual wxSize DoGetBestSize() const;

     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+    bool DoActualLayout();

     void OnEraseBackground(wxEraseEvent& evt);
     void OnPaint(wxPaintEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
     void OnPaint(wxPaintEvent& evt);
     void OnSize(wxSizeEvent& evt);


@@ -76,6 +79,7 @@ protected:
     void HideScrollButtons();
 
     void CommonInit(const wxString& label, const wxBitmap& icon);
     void HideScrollButtons();
 
     void CommonInit(const wxString& label, const wxBitmap& icon);

+    void PopulateSizeCalcArray(wxSize (wxWindow::*get_size)(void) const);

 
     wxArrayRibbonControl m_collapse_stack;
     wxBitmap m_icon;
 
     wxArrayRibbonControl m_collapse_stack;
     wxBitmap m_icon;


@@ -83,6 +87,8 @@ protected:
     // NB: Scroll button windows are siblings rather than children (to get correct clipping of children)
     wxRibbonPageScrollButton* m_scroll_left_btn;
     wxRibbonPageScrollButton* m_scroll_right_btn;
     // NB: Scroll button windows are siblings rather than children (to get correct clipping of children)
     wxRibbonPageScrollButton* m_scroll_left_btn;
     wxRibbonPageScrollButton* m_scroll_right_btn;

+    wxSize* m_size_calc_array;
+    size_t m_size_calc_array_size;

     int m_scroll_amount;
     int m_scroll_amount_limit;
     int m_size_in_major_axis_for_children;
     int m_scroll_amount;
     int m_scroll_amount_limit;
     int m_size_in_major_axis_for_children;