X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cff9681b857589f9328541762da1111fc4958689..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/ribbon/page.h?ds=sidebyside diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h index 2be1e69a5f..5d3fed58c3 100644 --- a/include/wx/ribbon/page.h +++ b/include/wx/ribbon/page.h @@ -61,11 +61,14 @@ public: virtual void RemoveChild(wxWindowBase *child); + void HideIfExpanded(); + 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 +79,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 +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; + 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;