From 84fe931ddf4b6cf66a42f9ef2a3caa79ea111814 Mon Sep 17 00:00:00 2001
From: Ryan Norton <wxprojects@comcast.net>
Date: Fri, 24 Sep 2004 08:58:52 +0000
Subject: [PATCH] Port syncronization, more wxUSE_XML/XRC fixes and typo fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/mac/setup0.h         |  2 +-
 include/wx/msw/setup0.h         |  2 +-
 include/wx/msw/setup_microwin.h | 19 +++++++++++++++++++
 include/wx/msw/wince/setup.h    |  2 +-
 include/wx/os2/setup0.h         | 19 +++++++++++++++++++
 include/wx/univ/setup0.h        |  2 +-
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index b0de647b1d..26cf94018e 100644
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -432,7 +432,7 @@
 //
 // Default is 1
 //
-// Recommended setting: 1 (requires XRC)
+// Recommended setting: 1 (requires wxUSE_XML)
 #define wxUSE_XRC       1
 
 // XML parsing classes. Note that their API will change in the future, so
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 726411ec57..8e6cc16308 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -463,7 +463,7 @@
 //
 // Default is 1
 //
-// Recommended setting: 1 (requires XRC)
+// Recommended setting: 1 (requires wxUSE_XML)
 #define wxUSE_XRC       1
 
 // XML parsing classes. Note that their API will change in the future, so
diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index d07e43d93b..c3718f7d6e 100644
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -392,6 +392,25 @@
 // wxSound class
 #define wxUSE_SOUND      0
 
+// Use wxWidget's XRC XML-based resource system.  Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#define wxUSE_XRC       1
+
+// XML parsing classes. Note that their API will change in the future, so
+// using wxXmlDocument and wxXmlNode in your app is not recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (required by XRC)
+#if wxUSE_XRC
+#  define wxUSE_XML       1
+#else
+#  define wxUSE_XML       0
+#endif
+
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------
diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 578988a64d..d653fe0b62 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -451,7 +451,7 @@
 //
 // Default is 1
 //
-// Recommended setting: 1 (requires XRC)
+// Recommended setting: 1 (requires wxUSE_XML)
 #define wxUSE_XRC       1
 
 // XML parsing classes. Note that their API will change in the future, so
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index e7724688d5..7219859d1a 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -371,6 +371,25 @@
 
 #define wxUSE_SOUND                1
 
+// Use wxWidget's XRC XML-based resource system.  Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#define wxUSE_XRC       1
+
+// XML parsing classes. Note that their API will change in the future, so
+// using wxXmlDocument and wxXmlNode in your app is not recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (required by XRC)
+#if wxUSE_XRC
+#  define wxUSE_XML       1
+#else
+#  define wxUSE_XML       0
+#endif
+
 #define wxUSE_REGEX               1
 
 #define wxUSE_FINDREPLDLG         1 // Find replace dialog
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 9bff8f602e..cf316cda3a 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -488,7 +488,7 @@
 //
 // Default is 1
 //
-// Recommended setting: 1 (requires XRC)
+// Recommended setting: 1 (requires wxUSE_XML)
 #define wxUSE_XRC       1
 
 // XML parsing classes. Note that their API will change in the future, so
-- 
2.47.2