#define _WX_CLRPICKER_H_
#include "wx/button.h"
+#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:
protected:
+ wxBitmap m_bitmap;
+
+ wxSize DoGetBestSize() const;
void UpdateColour();