Border corrections

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

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 5ec73c7fe148eb06aa0e0f884837898d4d36214d..758e51619ffb3e9dd9eab3affca52012bfba177c 100644 (file)
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -12,19 +12,13 @@
 #ifndef _WX_CLRPICKER_H_
 #define _WX_CLRPICKER_H_
 
-class WXDLLIMPEXP_CORE wxColourData;
+#include "wx/button.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,
                                                public wxColourPickerWidgetBase
 {
@@ -70,6 +64,8 @@ public:
 
 protected:
 
+    wxSize DoGetBestSize() const;
+
     void UpdateColour();
 
     // the colour data shown in wxColourPickerCtrlGeneric