X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f26ef31422b9d1496d9f19d53a489f6f04a1090..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/clrpickerg.h?ds=inline diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 16fe8413d5..50988f1924 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -13,20 +13,14 @@ #define _WX_CLRPICKER_H_ #include "wx/button.h" -#include "wx/cmndata.h" +#include "wx/bmpbuttn.h" +#include "wx/colourdata.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: @@ -70,6 +64,9 @@ public: protected: + wxBitmap m_bitmap; + + wxSize DoGetBestSize() const; void UpdateColour();