don't generate a scroll event when setting scroll position from scroll event handler

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

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 69f4a70e03e49dfdb0414b678b0662fa805b4d8b..dfb67c8fa9d914321088855cab85b5669ddb2069 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"
-
-class WXDLLIMPEXP_CORE wxColourData;
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // 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_DEFAULT_STYLE  wxCLRBTN_SHOW_LABEL
+#define wxCLRBTN_DEFAULT_STYLE  (wxCLRBTN_SHOW_LABEL)
 
 
 class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,