From f03b9d4585c6b087330598205d7e1de5ac10592b Mon Sep 17 00:00:00 2001
From: Mattia Barbon <mbarbon@cpan.org>
Date: Tue, 9 Apr 2002 19:34:59 +0000
Subject: [PATCH] Allow building with wxUSE_CALENDARCTRL=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
contrib/src/xrc/xh_cald.cpp | 6 ++++++
contrib/src/xrc/xmlrsall.cpp | 2 ++
src/xrc/xh_cald.cpp | 6 ++++++
src/xrc/xmlrsall.cpp | 2 ++
4 files changed, 16 insertions(+)
diff --git a/contrib/src/xrc/xh_cald.cpp b/contrib/src/xrc/xh_cald.cpp
index 861928fb96..70359323c9 100644
--- 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 2e956f6ee8..b55badc9f9 100644
--- 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 861928fb96..70359323c9 100644
--- 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 2e956f6ee8..b55badc9f9 100644
--- 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);
--
2.47.2