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
This commit is contained in:
parent
9581c3c6dc
commit
84fe931ddf
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user