Beginning of wxDataViewTreeStore API

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

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 69f4a70e03e49dfdb0414b678b0662fa805b4d8b..17dc568551bf8a55723ff0d920ec88aa4ddac46a 100644 (file)
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -13,8 +13,7 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"

-
-class WXDLLIMPEXP_CORE wxColourData;
+#include "wx/cmndata.h"

 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog


@@ -24,7 +23,7 @@ class WXDLLIMPEXP_CORE wxColourData;
 #define wxCLRBTN_SHOW_LABEL     100
 
 // the default style
 #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,
 
 
 class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,


@@ -72,6 +71,8 @@ public:
 
 protected:
 
 
 protected:
 

+    wxSize DoGetBestSize() const;
+

     void UpdateColour();
 
     // the colour data shown in wxColourPickerCtrlGeneric
     void UpdateColour();
 
     // the colour data shown in wxColourPickerCtrlGeneric