X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec376c8fd9ff813392030426acd2317c6fa6527e..90a77e64841dfcaf37103b6411987402739baa0b:/include/wx/generic/clrpickerg.h

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 5ec73c7fe1..17dc568551 100644
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -12,7 +12,8 @@
 #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
@@ -22,7 +23,7 @@ class WXDLLIMPEXP_CORE wxColourData;
 #define wxCLRBTN_SHOW_LABEL     100
 
 // the default style
-#define wxCLRBTN_DEFAULT_STYLE  wxCLRBTN_SHOW_LABEL
+#define wxCLRBTN_DEFAULT_STYLE  (wxCLRBTN_SHOW_LABEL)
 
 
 class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
@@ -70,6 +71,8 @@ public:
 
 protected:
 
+    wxSize DoGetBestSize() const;
+
     void UpdateColour();
 
     // the colour data shown in wxColourPickerCtrlGeneric