Use an enum for the colour/string conversion flags

[wxWidgets.git] / include / wx / xrc / xh_clrpicker.h

diff --git a/include/wx/xrc/xh_clrpicker.h b/include/wx/xrc/xh_clrpicker.h
index fb364c41a8b98439dd44de5cb52c3e9905db9829..dfaa356b400b22ffa164c160cf94ef802b2db813 100644 (file)
--- a/include/wx/xrc/xh_clrpicker.h
+++ b/include/wx/xrc/xh_clrpicker.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.cpp
+// Name:        wx/xrc/xh_clrpicker.h
 // Purpose:     XML resource handler for wxColourPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
@@ -13,17 +13,18 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_COLOURPICKERCTRL
+#if wxUSE_XRC && wxUSE_COLOURPICKERCTRL
 
 class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
+
 public:
     wxColourPickerCtrlXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_COLOURPICKERCTRL
+#endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL
 
 #endif // _WX_XH_CLRPICKERCTRL_H_