Fixed various NULL reference issues. Also cleaned up wxPGComboBox code overall a...

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

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index dfb67c8fa9d914321088855cab85b5669ddb2069..ba70b2087cc3d2d9677188d715083a2c391518d4 100644 (file)
--- 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/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:
@@ -70,6 +64,9 @@ public:
 
 
 protected:
+    wxBitmap    m_bitmap;
+
+    wxSize DoGetBestSize() const;
 
     void UpdateColour();