From 1ee3fb3846ae47c5292128a6f0bd4c8e38d7ba31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 7 Feb 2005 12:22:09 +0000 Subject: [PATCH] use wxUSE_DATEPICKCTRL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datectrl.h | 6 ++++++ include/wx/xrc/xh_datectrl.h | 4 ++++ src/xrc/xh_datectrl.cpp | 4 ++-- src/xrc/xmlrsall.cpp | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h index d221993aa0..76a6ffb332 100644 --- 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 5b1fdd0eda..67ccfcbd59 100644 --- 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 5ab0fa49dc..36b31266bd 100644 --- 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 d0e8dd7e69..33c80ae0cd 100644 --- 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 -- 2.45.2