X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d..b25278d885906c601a53fe4ddb246da2f68f66f9:/include/wx/ribbon/buttonbar.h diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h index b1642de78b..70985121ea 100644 --- a/include/wx/ribbon/buttonbar.h +++ b/include/wx/ribbon/buttonbar.h @@ -23,8 +23,8 @@ class wxRibbonButtonBarButtonBase; class wxRibbonButtonBarLayout; class wxRibbonButtonBarButtonInstance; -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonButtonBarLayout*, wxArrayRibbonButtonBarLayout, class WXDLLIMPEXP_RIBBON); -WX_DEFINE_USER_EXPORTED_ARRAY(wxRibbonButtonBarButtonBase*, wxArrayRibbonButtonBarButtonBase, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarLayout*, wxArrayRibbonButtonBarLayout, class WXDLLIMPEXP_RIBBON); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarButtonBase*, wxArrayRibbonButtonBarButtonBase, class WXDLLIMPEXP_RIBBON); class WXDLLIMPEXP_RIBBON wxRibbonButtonBar : public wxRibbonControl { @@ -66,7 +66,13 @@ public: const wxString& label, const wxBitmap& bitmap, const wxString& help_string = wxEmptyString); - + + virtual wxRibbonButtonBarButtonBase* AddToggleButton( + int button_id, + const wxString& label, + const wxBitmap& bitmap, + const wxString& help_string = wxEmptyString); + virtual wxRibbonButtonBarButtonBase* AddButton( int button_id, const wxString& label, @@ -82,14 +88,15 @@ public: virtual void ClearButtons(); virtual bool DeleteButton(int button_id); virtual void EnableButton(int button_id, bool enable = true); + virtual void ToggleButton(int button_id, bool checked); virtual void SetArtProvider(wxRibbonArtProvider* art); virtual bool IsSizingContinuous() const; virtual wxSize GetMinSize() const; - virtual wxSize DoGetBestSize() const; protected: friend class wxRibbonButtonBarEvent; + virtual wxSize DoGetBestSize() const; wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } void OnEraseBackground(wxEraseEvent& evt);