From: Vadim Zeitlin Date: Thu, 9 Nov 2006 00:55:08 +0000 (+0000) Subject: regenerated after the last change of setup_inc.h (changes in comments only) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a0680daf77e111920a65ebf24fc19f2129ab1cdc?ds=sidebyside regenerated after the last change of setup_inc.h (changes in comments only) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 039bc25dd7..a572b39648 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -553,14 +553,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1064,7 +1060,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index a180c44414..e81a647a95 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -552,14 +552,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1063,7 +1059,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 280c9f3380..1d17c3b077 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -552,14 +552,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1063,7 +1059,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index da0e4dfaea..b6c5098943 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -552,14 +552,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1063,7 +1059,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 5ab9487c38..92c565e71d 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -552,14 +552,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1063,7 +1059,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 06880364d8..b78ef797c1 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -552,14 +552,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -1063,7 +1059,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// Default is 1 under MSW, 0 is always used for the other platforms. // // Recommended setting: 1, only set to 0 if you have trouble compiling // wxCHMHelpController (could be a problem with really ancient compilers) diff --git a/setup.h.in b/setup.h.in index 9819817a86..78bc597c6b 100644 --- a/setup.h.in +++ b/setup.h.in @@ -294,11 +294,7 @@ #define wxUSE_XRC 0 -#if wxUSE_XRC -#define wxUSE_XML 0 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC #define wxUSE_AUI 0