Rebake from clean wx tree.

[wxWidgets.git] / include / wx / generic / clrpickerg.h

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 758e51619ffb3e9dd9eab3affca52012bfba177c..ba70b2087cc3d2d9677188d715083a2c391518d4 100644 (file)
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -13,13 +13,14 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"

+#include "wx/bmpbuttn.h"

 #include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 
 #include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
+class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton,

                                                public wxColourPickerWidgetBase
 {
 public:
                                                public wxColourPickerWidgetBase
 {
 public:


@@ -63,6 +64,7 @@ public:
 
 
 protected:
 
 
 protected:

+    wxBitmap    m_bitmap;

 
     wxSize DoGetBestSize() const;
 
 
     wxSize DoGetBestSize() const;