X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f9b662d60d32113d3bdc3ce7a4dcb46b7899c4..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/generic/clrpickerg.h diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 69f4a70e03..ba70b2087c 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -13,21 +13,14 @@ #define _WX_CLRPICKER_H_ #include "wx/button.h" - -class WXDLLIMPEXP_CORE wxColourData; +#include "wx/bmpbuttn.h" +#include "wx/cmndata.h" //----------------------------------------------------------------------------- // wxGenericColourButton: a button which brings up a wxColourDialog //----------------------------------------------------------------------------- -// show the colour in HTML form (#AABBCC) as colour button label -#define wxCLRBTN_SHOW_LABEL 100 - -// the default style -#define wxCLRBTN_DEFAULT_STYLE wxCLRBTN_SHOW_LABEL - - -class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton, +class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton, public wxColourPickerWidgetBase { public: @@ -71,6 +64,9 @@ public: protected: + wxBitmap m_bitmap; + + wxSize DoGetBestSize() const; void UpdateColour();