X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/include/wx/generic/clrpickerg.h diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 758e51619f..50988f1924 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -13,13 +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 //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton, +class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton, public wxColourPickerWidgetBase { public: @@ -63,6 +64,7 @@ public: protected: + wxBitmap m_bitmap; wxSize DoGetBestSize() const;