use wxUSE_DATEPICKCTRL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index d221993aa05affc9f149021dcfb9832347da4057..76a6ffb332006c2cbf3776a80af6be3ebbc227d0 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_DATEPICKCTRL
+
 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 
@@ -94,5 +98,7 @@ public:
     };
 #endif
 
+#endif // wxUSE_DATEPICKCTRL
+
 #endif // _WX_DATECTRL_H_
 

diff --git a/include/wx/xrc/xh_datectrl.h b/include/wx/xrc/xh_datectrl.h
index 5b1fdd0eda7787eb059916bc8f7ab3e8a768701b..67ccfcbd59bc79d28f3e0ea13bdb82066851f77b 100644 (file)
--- a/include/wx/xrc/xh_datectrl.h
+++ b/include/wx/xrc/xh_datectrl.h
@@ -17,6 +17,8 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_DATEPICKCTRL
+
 class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
@@ -26,4 +28,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_DATEPICKCTRL
+
 #endif // _WX_XH_DATECTRL_H_

diff --git a/src/xrc/xh_datectrl.cpp b/src/xrc/xh_datectrl.cpp
index 5ab0fa49dc71f30c7382d70daf1027b8415b4ad1..36b31266bdb15f9dd2d8f1ae404b509b637845d4 100644 (file)
--- a/src/xrc/xh_datectrl.cpp
+++ b/src/xrc/xh_datectrl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_DATEPICKCTRL
 
 #include "wx/xrc/xh_datectrl.h"
 #include "wx/datectrl.h"
@@ -57,4 +57,4 @@ bool wxDateCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxDatePickerCtrl"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index d0e8dd7e694b07fd1273ed4c8f559a4d948016b7..33c80ae0cd0c74c747ec1c020befc3b2589e52cf 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -107,7 +107,9 @@ void wxXmlResource::InitAllHandlers()
 #if wxUSE_STATUSBAR
     AddHandler(new wxStatusBarXmlHandler);
 #endif
+#if wxUSE_DATEPICKCTRL
     AddHandler(new wxDateCtrlXmlHandler);
+#endif
 }
 
 #endif // wxUSE_XRC