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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index b0de647b1d0c11e6a7355f35aebc3d3a9bbfa018..26cf94018e8cf0ba6d034d8d123362341e4fd835 100644 (file)
--- 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 726411ec578da69a84f6285d0c8d160fb30ea43a..8e6cc163082588f471be42124c44ecccf6dd004b 100644 (file)
--- 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 d07e43d93beac47a1619f8eec6d4ce38555fab84..c3718f7d6e4120d3613eb87dabd7acbd2a1a4176 100644 (file)
--- 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 578988a64d88eb9ff9f136af35a33fb373f6438b..d653fe0b62a65a91de3e82b09235cf6890841bcd 100644 (file)
--- 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 e7724688d568f1abf15bb7e40fe69285db8bd6f3..7219859d1a4904a3ec7af558449b103893a8be33 100644 (file)
--- 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 9bff8f602e79bd115579f3cbd8d5feb279ca3de8..cf316cda3a5bcc221cfbdbdabdb52743263603d1 100644 (file)
--- 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