Allow building with wxUSE_CALENDARCTRL=0

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

diff --git a/contrib/src/xrc/xh_cald.cpp b/contrib/src/xrc/xh_cald.cpp
index 861928fb96252e868b4245c23c78859b49f58974..70359323c98e751cf9494c12feb779cd7e6cce62 100644 (file)
--- a/contrib/src/xrc/xh_cald.cpp
+++ b/contrib/src/xrc/xh_cald.cpp
@@ -19,6 +19,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/setup.h"
+
+#if wxUSE_CALENDARCTRL
+
 #include "wx/xrc/xh_cald.h"
 #include "wx/event.h"
 #include "wx/calctrl.h"
@@ -57,3 +61,5 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
+
+#endif

diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp
index 2e956f6ee824252c06b01fe5f8d85783ef4f4901..b55badc9f93f0f5653edb0b3903913ddf4578391 100644 (file)
--- a/contrib/src/xrc/xmlrsall.cpp
+++ b/contrib/src/xrc/xmlrsall.cpp
@@ -38,7 +38,9 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxStaticBoxXmlHandler);
     AddHandler(new wxStaticBitmapXmlHandler);
     AddHandler(new wxTreeCtrlXmlHandler);
+#if wxUSE_CALENDARCTRL
     AddHandler(new wxCalendarCtrlXmlHandler);
+#endif
     AddHandler(new wxListCtrlXmlHandler);
 #if wxUSE_CHECKLISTBOX
     AddHandler(new wxCheckListXmlHandler);

diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 861928fb96252e868b4245c23c78859b49f58974..70359323c98e751cf9494c12feb779cd7e6cce62 100644 (file)
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -19,6 +19,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/setup.h"
+
+#if wxUSE_CALENDARCTRL
+
 #include "wx/xrc/xh_cald.h"
 #include "wx/event.h"
 #include "wx/calctrl.h"
@@ -57,3 +61,5 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
+
+#endif

diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 2e956f6ee824252c06b01fe5f8d85783ef4f4901..b55badc9f93f0f5653edb0b3903913ddf4578391 100644 (file)
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -38,7 +38,9 @@ void wxXmlResource::InitAllHandlers()
     AddHandler(new wxStaticBoxXmlHandler);
     AddHandler(new wxStaticBitmapXmlHandler);
     AddHandler(new wxTreeCtrlXmlHandler);
+#if wxUSE_CALENDARCTRL
     AddHandler(new wxCalendarCtrlXmlHandler);
+#endif
     AddHandler(new wxListCtrlXmlHandler);
 #if wxUSE_CHECKLISTBOX
     AddHandler(new wxCheckListXmlHandler);