X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d..db414879d45f5da2be534a0f523b0506f2ab1183:/include/wx/ribbon/page.h diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h index 80d8e6f1cf..6fc54ac2ed 100644 --- 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; - virtual wxSize DoGetBestSize() const; void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height); void AdjustRectToIncludeScrollButtons(wxRect* rect) const; @@ -63,9 +62,11 @@ public: virtual void RemoveChild(wxWindowBase *child); 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); + bool DoActualLayout(); void OnEraseBackground(wxEraseEvent& evt); void OnPaint(wxPaintEvent& evt); void OnSize(wxSizeEvent& evt); @@ -76,6 +77,7 @@ protected: 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; @@ -83,6 +85,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; + 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;