implementing changes in toolbartool directly

[wxWidgets.git] / include / wx / palmos / setup0.h

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 473729ea37e8e4bbf00cbacf0aa32c60aecfb67f..0433d57944a1c0294778556443d38da094623ce8 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -12,6 +12,7 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 

+/* --- start common options --- */

 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------


@@ -26,15 +27,17 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 2.4 API: set it to 1 to
-// enable it but please consider updating your code instead.
+// This setting determines the compatibility with 2.6 API: set it to 0 to
+// flag all cases of using deprecated functions.

 //
 //

-// Default is 0
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.

 //
 // Recommended setting: 0 (please update your code)
 //
 // Recommended setting: 0 (please update your code)

-#define WXWIN_COMPATIBILITY_2_4 0
+#define WXWIN_COMPATIBILITY_2_6 0

 
 

-// This setting determines the compatibility with 2.6 API: set it to 0 to
+// This setting determines the compatibility with 2.8 API: set it to 0 to

 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will
 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will


@@ -42,15 +45,16 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)

-#define WXWIN_COMPATIBILITY_2_6 0
+#define WXWIN_COMPATIBILITY_2_8 1

 
 

-// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
-// If migrating between versions, your dialogs may seem to shrink.
+// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
+// default system font is used for wxWindow::GetCharWidth/Height() instead of
+// the current font.

 //
 //

-// Default is 1
+// Default is 0

 //
 //

-// Recommended setting: 0 (the new calculations are more correct!)
-#define wxDIALOG_UNIT_COMPATIBILITY   1
+// Recommended setting: 0
+#define wxDIALOG_UNIT_COMPATIBILITY   0

 
 // ----------------------------------------------------------------------------
 // debugging settings
 
 // ----------------------------------------------------------------------------
 // debugging settings


@@ -118,57 +122,41 @@
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.

-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#else
-#define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 1
+
+// Set this to 1 to be able to generate a human-readable (unlike
+// machine-readable minidump created by wxCrashReport::Generate()) stack back
+// trace when your program crashes using wxStackWalker
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, set to 0 if your programs never crash
+#define wxUSE_STACKWALKER 1
+
+// Set this to 1 to compile in wxDebugReport class which allows you to create
+// and optionally upload to your web site a debug report consisting of back
+// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, it is compiled into a separate library so there
+//                         is no overhead if you don't use it
+#define wxUSE_DEBUGREPORT 1

 
 // ----------------------------------------------------------------------------
 // Unicode support
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Unicode support
 // ----------------------------------------------------------------------------
 

-// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
-// defined as wchar_t, wxString will use Unicode internally. If you set this
-// to 1, you must use wxT() macro for all literal strings in the program.
-//
-// Unicode is currently only fully supported under Windows NT/2000/XP
-// (Windows 9x doesn't support it and the programs compiled in Unicode mode
-// will not run under 9x -- but see wxUSE_UNICODE_MSLU below).
-//
-// Default is 0
-//
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
+// These settings are obsolete: the library is always built in Unicode mode
+// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
+// absolutely necessary -- updating it is strongly recommended as the ANSI mode
+// will disappear completely in future wxWidgets releases.

 #ifndef wxUSE_UNICODE
 #ifndef wxUSE_UNICODE

-    #define wxUSE_UNICODE 0
+    #define wxUSE_UNICODE 1

 #endif
 
 #endif
 

-// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
-// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#define wxUSE_UNICODE_MSLU 0
-
-// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
-// compiling the program in Unicode mode. More precisely, it will be possible
-// to construct wxString from a wide (Unicode) string and convert any wxString
-// to Unicode.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WCHAR_T 0
+// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
+#define wxUSE_WCHAR_T 1

 
 // ----------------------------------------------------------------------------
 // global features
 
 // ----------------------------------------------------------------------------
 // global features


@@ -181,6 +169,9 @@
 // code will lead to undefined behaviour -- but the code itself will be
 // slightly smaller and faster.
 //
 // code will lead to undefined behaviour -- but the code itself will be
 // slightly smaller and faster.
 //

+// Note that like wxUSE_THREADS this option is automatically set to 0 if
+// wxNO_EXCEPTIONS is defined.
+//

 // Default is 1
 //
 // Recommended setting: depends on whether you intend to use C++ exceptions
 // Default is 1
 //
 // Recommended setting: depends on whether you intend to use C++ exceptions


@@ -191,14 +182,9 @@
 //
 // Default is 0
 //
 //
 // Default is 0
 //

-// Recommended setting: 0
+// Recommended setting: 0 (this is still work in progress...)

 #define wxUSE_EXTENDED_RTTI 0
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#if defined(__BORLANDC__)
-#undef wxUSE_EXTENDED_RTTI
-#define wxUSE_EXTENDED_RTTI 1
-#endif
-

 // Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
 // std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
 // and for wxHashMap to be implemented with templates.
 // Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
 // std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
 // and for wxHashMap to be implemented with templates.


@@ -215,23 +201,23 @@
 // Default is 1
 //
 // Recommended setting: 1 (always)
 // Default is 1
 //
 // Recommended setting: 1 (always)

-#define wxUSE_LOG 0
+#define wxUSE_LOG 1

 
 // Recommended setting: 1
 
 // Recommended setting: 1

-#define wxUSE_LOGWINDOW 0
+#define wxUSE_LOGWINDOW 1

 
 // Recommended setting: 1
 
 // Recommended setting: 1

-#define wxUSE_LOGGUI 0
+#define wxUSE_LOGGUI 1

 
 // Recommended setting: 1
 
 // Recommended setting: 1

-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1

 
 // Support for command line parsing using wxCmdLineParser class.
 //
 // Default is 1
 //
 // Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
 
 // Support for command line parsing using wxCmdLineParser class.
 //
 // Default is 1
 //
 // Recommended setting: 1 (can be set to 0 if you don't use the cmd line)

-#define wxUSE_CMDLINE_PARSER 0
+#define wxUSE_CMDLINE_PARSER 1

 
 // Support for multithreaded applications: if 1, compile in thread classes
 // (thread.h) and make the library a bit more thread safe. Although thread
 
 // Support for multithreaded applications: if 1, compile in thread classes
 // (thread.h) and make the library a bit more thread safe. Although thread


@@ -239,18 +225,78 @@
 // library without it if you have no use for it - this will result in a
 // somewhat smaller and faster operation.
 //
 // library without it if you have no use for it - this will result in a
 // somewhat smaller and faster operation.
 //

-// This is ignored under Win16, threads are only supported under Win32.
+// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
+// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
+// build/msw/config.* file this value will have no effect.

 //
 // Default is 1
 //
 // Recommended setting: 0 unless you do plan to develop MT applications
 //
 // Default is 1
 //
 // Recommended setting: 0 unless you do plan to develop MT applications

-#define wxUSE_THREADS 0
+#define wxUSE_THREADS 1
+
+// If enabled, compiles wxWidgets streams classes
+//
+// wx stream classes are used for image IO, process IO redirection, network
+// protocols implementation and much more and so disabling this results in a
+// lot of other functionality being lost.
+//
+// Default is 1
+//
+// Recommended setting: 1 as setting it to 0 disables many other things
+#define wxUSE_STREAMS       1
+
+// This is not a real option but is used as the default value for
+// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING.
+//
+// Currently the Digital Mars and Watcom compilers come without standard C++
+// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
+// them (e.g. from STLPort).
+//
+// VC++ 5.0 does include standard C++ library headers, however they produce
+// many warnings that can't be turned off when compiled at warning level 4.
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0
+#else
+    #define wxUSE_STD_DEFAULT  1
+#endif
+
+// Use standard C++ streams if 1 instead of wx streams in some places. If
+// disabled (default), wx streams are used everywhere and wxWidgets doesn't
+// depend on the standard streams library.
+//
+// Notice that enabling this does not replace wx streams with std streams
+// everywhere, in a lot of places wx streams are used no matter what.
+//
+// Default is 0
+//
+// Recommended setting: 1 if you use the standard streams anyhow and so
+//                      dependency on the standard streams library is not a
+//                      problem
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT

 
 

-// If enabled (1), compiles wxWidgets streams classes
-#define wxUSE_STREAMS       0
+// Enable conversion to standard C++ string if 1.
+//
+// Default is 1 for most compilers.
+//
+// Recommended setting: 1 unless you want to ensure your program doesn't use
+//                      the standard C++ library at all.
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT

 
 

-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
-#define wxUSE_STD_IOSTREAM  0
+// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
+// Note that if the system's implementation does not support positional
+// parameters, setting this to 1 forces the use of the wxWidgets implementation
+// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
+// many Unix systems but usually doesn't under Windows.
+//
+// Positional parameters are very useful when translating a program since using
+// them in formatting strings allow translators to correctly reorder the
+// translated sentences.
+//
+// Default is 1
+//
+// Recommended setting: 1 if you want to support multiple languages
+#define wxUSE_PRINTF_POS_PARAMS      1

 
 // ----------------------------------------------------------------------------
 // non GUI features selection
 
 // ----------------------------------------------------------------------------
 // non GUI features selection


@@ -269,6 +315,24 @@
 // Recommended setting: 1
 #define wxUSE_LONGLONG      1
 
 // Recommended setting: 1
 #define wxUSE_LONGLONG      1
 

+// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
+// storing binary data in wxConfig on most platforms.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_BASE64        1
+
+// Set this to 1 to be able to use wxEventLoop even in console applications
+// (i.e. using base library only, without GUI). This is mostly useful for
+// processing socket events but is also necessary to use timers in console
+// applications
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_CONSOLE_EVENTLOOP 1
+

 // Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
 // POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
 //
 // Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
 // POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
 //


@@ -276,8 +340,8 @@
 //
 // Recommended setting: 1 (wxFile is highly recommended as it is required by
 // i18n code, wxFileConfig and others)
 //
 // Recommended setting: 1 (wxFile is highly recommended as it is required by
 // i18n code, wxFileConfig and others)

-#define wxUSE_FILE          0
-#define wxUSE_FFILE         0
+#define wxUSE_FILE          1
+#define wxUSE_FFILE         1

 
 // Use wxFSVolume class providing access to the configured/active mount points
 //
 
 // Use wxFSVolume class providing access to the configured/active mount points
 //


@@ -295,14 +359,29 @@
 #define wxUSE_STDPATHS      1
 
 // use wxTextBuffer class: required by wxTextFile
 #define wxUSE_STDPATHS      1
 
 // use wxTextBuffer class: required by wxTextFile

-#define wxUSE_TEXTBUFFER    0
+#define wxUSE_TEXTBUFFER    1

 
 // use wxTextFile class: requires wxFile and wxTextBuffer, required by
 // wxFileConfig
 
 // use wxTextFile class: requires wxFile and wxTextBuffer, required by
 // wxFileConfig

-#define wxUSE_TEXTFILE      0
+#define wxUSE_TEXTFILE      1

 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.

-#define wxUSE_INTL          0
+#define wxUSE_INTL          1
+
+// Provide wxFoo_l() functions similar to standard foo() functions but taking
+// an extra locale parameter.
+//
+// Notice that this is fully implemented only for the systems providing POSIX
+// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
+// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
+// only work for the current user locale and "C" locale. You can use
+// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
+//
+// Default is 1
+//
+// Recommended setting: 1 but may be disabled if you are writing programs
+// running only in C locale anyhow
+#define wxUSE_XLOCALE       1

 
 // Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
 // allow to manipulate dates, times and time intervals. wxDateTime replaces the
 
 // Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
 // allow to manipulate dates, times and time intervals. wxDateTime replaces the


@@ -326,14 +405,14 @@
 // Default is 1
 //
 // Recommended setting: 1
 // Default is 1
 //
 // Recommended setting: 1

-#define wxUSE_TIMER         0
+#define wxUSE_TIMER         1

 
 // Use wxStopWatch clas.
 //
 // Default is 1
 //
 // Recommended setting: 1 (needed by wxSocket)
 
 // Use wxStopWatch clas.
 //
 // Default is 1
 //
 // Recommended setting: 1 (needed by wxSocket)

-#define wxUSE_STOPWATCH     0
+#define wxUSE_STOPWATCH     1

 
 // Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
 // which allow the application to store its settings in the persistent
 
 // Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
 // which allow the application to store its settings in the persistent


@@ -365,7 +444,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_DIALUP_MANAGER   0
+#define wxUSE_DIALUP_MANAGER   1

 
 // Compile in classes for run-time DLL loading and function calling.
 // Required by wxUSE_DIALUP_MANAGER.
 
 // Compile in classes for run-time DLL loading and function calling.
 // Required by wxUSE_DIALUP_MANAGER.


@@ -375,32 +454,49 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_DYNLIB_CLASS    0
+#define wxUSE_DYNLIB_CLASS    1

 
 // experimental, don't use for now
 
 // experimental, don't use for now

-#define wxUSE_DYNAMIC_LOADER  0
+#define wxUSE_DYNAMIC_LOADER  1

 
 // Set to 1 to use socket classes
 
 // Set to 1 to use socket classes

-#define wxUSE_SOCKETS       0
+#define wxUSE_SOCKETS       1
+
+// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
+//
+// Notice that currently setting this option under Windows will result in
+// programs which can only run on recent OS versions (with ws2_32.dll
+// installed) which is why it is disabled by default.
+//
+// Default is 1.
+//
+// Recommended setting: 1 if you need IPv6 support
+#define wxUSE_IPV6          0

 
 // Set to 1 to enable virtual file systems (required by wxHTML)
 
 // Set to 1 to enable virtual file systems (required by wxHTML)

-#define wxUSE_FILESYSTEM    0
+#define wxUSE_FILESYSTEM    1

 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)

-#define wxUSE_FS_ZIP        0
+#define wxUSE_FS_ZIP        1
+
+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1

 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)

-#define wxUSE_FS_INET       0
+#define wxUSE_FS_INET       1

 
 // wxArchive classes for accessing archives such as zip and tar
 
 // wxArchive classes for accessing archives such as zip and tar

-#define wxUSE_ARCHIVE_STREAMS     0
+#define wxUSE_ARCHIVE_STREAMS     1

 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 
 // Set to 1 to compile wxZipInput/OutputStream classes.

-#define wxUSE_ZIPSTREAM     0
+#define wxUSE_ZIPSTREAM     1
+
+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1

 
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG

-#define wxUSE_ZLIB          0
+#define wxUSE_ZLIB          1

 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different


@@ -409,16 +505,19 @@
 // Default is 1.
 //
 // Recommended setting: 1 unless you don't like the license terms (unlikely)
 // Default is 1.
 //
 // Recommended setting: 1 unless you don't like the license terms (unlikely)

-#define wxUSE_APPLE_IEEE          0
+#define wxUSE_APPLE_IEEE          1

 
 // Joystick support class
 
 // Joystick support class

-#define wxUSE_JOYSTICK            0
+#define wxUSE_JOYSTICK            1
+
+// wxFontEnumerator class
+#define wxUSE_FONTENUM 1

 
 // wxFontMapper class
 
 // wxFontMapper class

-#define wxUSE_FONTMAP 0
+#define wxUSE_FONTMAP 1

 
 // wxMimeTypesManager class
 
 // wxMimeTypesManager class

-#define wxUSE_MIMETYPE 0
+#define wxUSE_MIMETYPE 1

 
 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
 // or wxURL you need to set this to 1.
 
 // wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
 // or wxURL you need to set this to 1.


@@ -426,15 +525,15 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_PROTOCOL 0
+#define wxUSE_PROTOCOL 1

 
 // The settings for the individual URL schemes
 
 // The settings for the individual URL schemes

-#define wxUSE_PROTOCOL_FILE 0
-#define wxUSE_PROTOCOL_FTP 0
-#define wxUSE_PROTOCOL_HTTP 0
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1

 
 // Define this to use wxURL class.
 
 // Define this to use wxURL class.

-#define wxUSE_URL 0
+#define wxUSE_URL 1

 
 // Define this to use native platform url and protocol support.
 // Currently valid only for MS-Windows.
 
 // Define this to use native platform url and protocol support.
 // Currently valid only for MS-Windows.


@@ -446,6 +545,15 @@
 // This code is experimental and subject to change.
 #define wxUSE_URL_NATIVE 0
 
 // This code is experimental and subject to change.
 #define wxUSE_URL_NATIVE 0
 

+// Support for wxVariant class used in several places throughout the library,
+// notably in wxDataViewCtrl API.
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you want to reduce the library size as much as
+// possible in which case setting this to 0 can gain up to 100KB.
+#define wxUSE_VARIANT 1
+

 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.
 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.


@@ -454,33 +562,70 @@
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it

-#define wxUSE_REGEX       0
+#define wxUSE_REGEX       1

 
 // wxSystemOptions class
 
 // wxSystemOptions class

-#define wxUSE_SYSTEM_OPTIONS 0
+#define wxUSE_SYSTEM_OPTIONS 1

 
 // wxSound class
 
 // wxSound class

-#define wxUSE_SOUND      0
+#define wxUSE_SOUND      1
+
+// Use wxMediaCtrl
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_MEDIACTRL     1

 
 

-#define wxUSE_MEDIACTRL 0
+// Use GStreamer for Unix (req a lot of dependancies)
+//
+// Default is 0
+//
+// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
+#define wxUSE_GSTREAMER    0

 
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1
 //
 // Recommended setting: 1 (requires wxUSE_XML)
 
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1
 //
 // Recommended setting: 1 (requires wxUSE_XML)

-#define wxUSE_XRC       0
+#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.
 //
 
 // 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)
 //
 // Recommended setting: 1 (required by XRC)

-#if wxUSE_XRC
-#  define wxUSE_XML       1
-#else
-#  define wxUSE_XML       0
+#define wxUSE_XML       wxUSE_XRC
+
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
+// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_STC 1
+
+
+// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
+// 2D drawing API.  (Still somewhat experimental)
+//
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
+//
+// Default is 0
+//
+// Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -501,7 +646,7 @@
 // Default is 1
 //
 // Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
 // Default is 1
 //
 // Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)

-#define wxUSE_POPUPWIN     0
+#define wxUSE_POPUPWIN     1

 
 // wxTipWindow allows to implement the custom tooltips, it is used by the
 // context help classes. Requires wxUSE_POPUPWIN.
 
 // wxTipWindow allows to implement the custom tooltips, it is used by the
 // context help classes. Requires wxUSE_POPUPWIN.


@@ -509,7 +654,7 @@
 // Default is 1
 //
 // Recommended setting: 1 (may be set to 0)
 // Default is 1
 //
 // Recommended setting: 1 (may be set to 0)

-#define wxUSE_TIPWINDOW    0
+#define wxUSE_TIPWINDOW    1

 
 // Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your
 
 // Each of the settings below corresponds to one wxWidgets control. They are
 // all switched on by default but may be disabled if you are sure that your


@@ -520,44 +665,55 @@
 // Default is 1
 //
 // Recommended setting: 1
 // Default is 1
 //
 // Recommended setting: 1

-#define wxUSE_BUTTON       1    // wxButton
-#define wxUSE_BMPBUTTON    0    // wxBitmapButton
-#define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
-#define wxUSE_CHECKBOX     1    // wxCheckBox
-#define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE       0    // wxChoice
-#define wxUSE_COMBOBOX     0    // wxComboBox
-#define wxUSE_DATEPICKCTRL 1    // wxDatePickerCtrl
-#define wxUSE_GAUGE        0    // wxGauge
-#define wxUSE_LISTBOX      0    // wxListBox
-#define wxUSE_LISTCTRL     0    // wxListCtrl
-#define wxUSE_RADIOBOX     1    // wxRadioBox
-#define wxUSE_RADIOBTN     1    // wxRadioButton
-#define wxUSE_SCROLLBAR    0    // wxScrollBar
-#define wxUSE_SLIDER       1    // wxSlider
-#define wxUSE_SPINBTN      0    // wxSpinButton
-#define wxUSE_SPINCTRL     0    // wxSpinCtrl
-#define wxUSE_STATBOX      0    // wxStaticBox
-#define wxUSE_STATLINE     0    // wxStaticLine
-#define wxUSE_STATTEXT     1    // wxStaticText
-#define wxUSE_STATBMP      0    // wxStaticBitmap
-#define wxUSE_TEXTCTRL     0    // wxTextCtrl
-#define wxUSE_TOGGLEBTN    1    // requires wxButton
-#define wxUSE_TREECTRL     0    // wxTreeCtrl
+#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
+#define wxUSE_BUTTON        1   // wxButton
+#define wxUSE_BMPBUTTON     1   // wxBitmapButton
+#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
+#define wxUSE_CHECKBOX      1   // wxCheckBox
+#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHOICE        1   // wxChoice
+#define wxUSE_COLLPANE      1   // wxCollapsiblePane
+#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
+#define wxUSE_COMBOBOX      1   // wxComboBox
+#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
+#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
+#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
+#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
+#define wxUSE_FILECTRL      1   // wxFileCtrl
+#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
+#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
+#define wxUSE_GAUGE         1   // wxGauge
+#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
+#define wxUSE_LISTBOX       1   // wxListBox
+#define wxUSE_LISTCTRL      1   // wxListCtrl
+#define wxUSE_RADIOBOX      1   // wxRadioBox
+#define wxUSE_RADIOBTN      1   // wxRadioButton
+#define wxUSE_SCROLLBAR     1   // wxScrollBar
+#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
+#define wxUSE_SLIDER        1   // wxSlider
+#define wxUSE_SPINBTN       1   // wxSpinButton
+#define wxUSE_SPINCTRL      1   // wxSpinCtrl
+#define wxUSE_STATBOX       1   // wxStaticBox
+#define wxUSE_STATLINE      1   // wxStaticLine
+#define wxUSE_STATTEXT      1   // wxStaticText
+#define wxUSE_STATBMP       1   // wxStaticBitmap
+#define wxUSE_TEXTCTRL      1   // wxTextCtrl
+#define wxUSE_TOGGLEBTN     1   // requires wxButton
+#define wxUSE_TREECTRL      1   // wxTreeCtrl

 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR

-// below either wxStatusBarPalm or a generic wxStatusBar will be used.
+// below either wxStatusBar95 or a generic wxStatusBar will be used.

 //
 // Default is 1
 //
 // Recommended setting: 1
 #define wxUSE_STATUSBAR    1
 
 //
 // Default is 1
 //
 // Recommended setting: 1
 #define wxUSE_STATUSBAR    1
 

-// Two status bar implementations are available under PalmOS: the generic one
-// or the wrapper around native status bar. For native look and feel the native
+// Two status bar implementations are available under Win32: the generic one
+// or the wrapper around native control. For native look and feel the native

 // version should be used.
 //
 // version should be used.
 //

-// Default is 1.
+// Default is 1 for the platforms where native status bar is supported.

 //
 // Recommended setting: 1 (there is no advantage in using the generic one)
 #define wxUSE_NATIVE_STATUSBAR        1
 //
 // Recommended setting: 1 (there is no advantage in using the generic one)
 #define wxUSE_NATIVE_STATUSBAR        1


@@ -569,18 +725,18 @@
 // Default is 1 for all settings.
 //
 // Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
 // Default is 1 for all settings.
 //
 // Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.

-#define wxUSE_TOOLBAR 0
-#define wxUSE_TOOLBAR_NATIVE 0
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1

 
 // wxNotebook is a control with several "tabs" located on one of its sides. It
 
 // wxNotebook is a control with several "tabs" located on one of its sides. It

-// may be used ot logically organise the data presented to the user instead of
+// may be used to logically organise the data presented to the user instead of

 // putting everything in one huge dialog. It replaces wxTabControl and related
 // classes of wxWin 1.6x.
 //
 // Default is 1.
 //
 // Recommended setting: 1
 // putting everything in one huge dialog. It replaces wxTabControl and related
 // classes of wxWin 1.6x.
 //
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_NOTEBOOK 0
+#define wxUSE_NOTEBOOK 1

 
 // wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
 // the tabs
 
 // wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
 // the tabs


@@ -588,7 +744,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_LISTBOOK 0
+#define wxUSE_LISTBOOK 1

 
 // wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
 // the tabs
 
 // wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
 // the tabs


@@ -596,7 +752,23 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_CHOICEBOOK 0
+#define wxUSE_CHOICEBOOK 1
+
+// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TREEBOOK 1
+
+// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
+// tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TOOLBOOK 1

 
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.


@@ -606,23 +778,64 @@
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 

+// wxTaskBarIcon is a small notification icon shown in the system toolbar or
+// dock.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be set to 0 if you don't need it)
+#define wxUSE_TASKBARICON 1
+

 // wxGrid class
 //
 // wxGrid class
 //

-// Default is 1 for both options.
+// Default is 1, set to 0 to cut down compilation time and binaries size if you
+// don't use it.

 //
 // Recommended setting: 1
 //
 //
 // Recommended setting: 1
 //

-#define wxUSE_GRID         0
+#define wxUSE_GRID         1
+
+// wxMiniFrame class: a frame with narrow title bar
+//
+// Default is 1.
+//
+// Recommended setting: 1 (it doesn't cost almost anything)
+#define wxUSE_MINIFRAME 1
+
+// wxComboCtrl and related classes: combobox with custom popup window and
+// not necessarily a listbox.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
+//                      it used by wxComboBox
+#define wxUSE_COMBOCTRL 1
+
+// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
+// items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0, except where it is
+//                      needed as a base class for generic wxBitmapComboBox.
+#define wxUSE_ODCOMBOBOX 1
+
+// wxBitmapComboBox is a combobox that can have images in front of text items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0
+#define wxUSE_BITMAPCOMBOBOX 1

 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 // ----------------------------------------------------------------------------
 
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 // ----------------------------------------------------------------------------
 
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)

-#define wxUSE_ACCEL 0
+#define wxUSE_ACCEL 1

 
 // Hotkey support (currently Windows only)
 
 // Hotkey support (currently Windows only)

-#define wxUSE_HOTKEY 0
+#define wxUSE_HOTKEY 1

 
 // Use wxCaret: a class implementing a "cursor" in a text control (called caret
 // under Windows).
 
 // Use wxCaret: a class implementing a "cursor" in a text control (called caret
 // under Windows).


@@ -630,18 +843,19 @@
 // Default is 1.
 //
 // Recommended setting: 1 (can be safely set to 0, not used by the library)
 // Default is 1.
 //
 // Recommended setting: 1 (can be safely set to 0, not used by the library)

-#define wxUSE_CARET         0
+#define wxUSE_CARET         1

 
 // Use wxDisplay class: it allows enumerating all displays on a system and
 
 // Use wxDisplay class: it allows enumerating all displays on a system and

-// working with them.
+// their geometries as well as finding the display on which the given point or
+// window lies.

 //
 //

-// Default is 0 because it isn't yet implemented on all platforms
+// Default is 1.

 //
 // Recommended setting: 1 if you need it, can be safely set to 0 otherwise
 //
 // Recommended setting: 1 if you need it, can be safely set to 0 otherwise

-#define wxUSE_DISPLAY       0
+#define wxUSE_DISPLAY       1

 
 // Miscellaneous geometry code: needed for Canvas library
 
 // Miscellaneous geometry code: needed for Canvas library

-#define wxUSE_GEOMETRY            0
+#define wxUSE_GEOMETRY            1

 
 // Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
 // wxListCtrl.
 
 // Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
 // wxListCtrl.


@@ -650,7 +864,7 @@
 //
 // Recommended setting: 1 (set it to 0 if you don't use any of the controls
 // enumerated above, then this class is mostly useless too)
 //
 // Recommended setting: 1 (set it to 0 if you don't use any of the controls
 // enumerated above, then this class is mostly useless too)

-#define wxUSE_IMAGLIST      0
+#define wxUSE_IMAGLIST      1

 
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //
 
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //


@@ -659,39 +873,54 @@
 // Recommended setting: 1 (can't be disabled under MSW)
 #define wxUSE_MENUS         1
 
 // Recommended setting: 1 (can't be disabled under MSW)
 #define wxUSE_MENUS         1
 

+// Use wxNotificationMessage.
+//
+// wxNotificationMessage allows to show non-intrusive messages to the user
+// using balloons, banners, popups or whatever is the appropriate method for
+// the current platform.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_NOTIFICATION_MESSAGE 1
+

 // Use wxSashWindow class.
 //
 // Default is 1.
 //
 // Recommended setting: 1
 // Use wxSashWindow class.
 //
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_SASH          0
+#define wxUSE_SASH          1

 
 // Use wxSplitterWindow class.
 //
 // Default is 1.
 //
 // Recommended setting: 1
 
 // Use wxSplitterWindow class.
 //
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_SPLITTER      0
+#define wxUSE_SPLITTER      1

 
 // Use wxToolTip and wxWindow::Set/GetToolTip() methods.
 //
 // Default is 1.
 //
 // Recommended setting: 1
 
 // Use wxToolTip and wxWindow::Set/GetToolTip() methods.
 //
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_TOOLTIPS      0
+#define wxUSE_TOOLTIPS      1

 
 // wxValidator class and related methods
 
 // wxValidator class and related methods

-#define wxUSE_VALIDATORS 0
-
-// wxDC cacheing implementation
-#define wxUSE_DC_CACHEING 0
-
-// Set this to 1 to enable the use of DIB's for wxBitmap to support
-// bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
-#define wxUSE_DIB_FOR_BITMAP 0
-
-// Set this to 1 to enable wxDIB
-#define wxUSE_WXDIB 0
+#define wxUSE_VALIDATORS 1
+
+// Use reference counted ID management: this means that wxWidgets will track
+// the automatically allocated ids (those used when you use wxID_ANY when
+// creating a window, menu or toolbar item &c) instead of just supposing that
+// the program never runs out of them. This is mostly useful only under wxMSW
+// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
+// long-running programs can run into problems with ids reuse without this. On
+// the other platforms, where the ids have the full int range, this shouldn't
+// be necessary.
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 1
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif

 
 // ----------------------------------------------------------------------------
 // common dialogs
 
 // ----------------------------------------------------------------------------
 // common dialogs


@@ -704,18 +933,18 @@
 // Default is 1
 //
 // Recommended setting: 1 (unless it really doesn't work)
 // Default is 1
 //
 // Recommended setting: 1 (unless it really doesn't work)

-#define wxUSE_COMMON_DIALOGS 0
+#define wxUSE_COMMON_DIALOGS 1

 
 // wxBusyInfo displays window with message when app is busy. Works in same way
 // as wxBusyCursor
 
 // wxBusyInfo displays window with message when app is busy. Works in same way
 // as wxBusyCursor

-#define wxUSE_BUSYINFO      0
+#define wxUSE_BUSYINFO      1

 
 // Use single/multiple choice dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
 
 // Use single/multiple choice dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)

-#define wxUSE_CHOICEDLG     0
+#define wxUSE_CHOICEDLG     1

 
 // Use colour picker dialog
 //
 
 // Use colour picker dialog
 //


@@ -725,7 +954,7 @@
 #define wxUSE_COLOURDLG     1
 
 // wxDirDlg class for getting a directory name from user
 #define wxUSE_COLOURDLG     1
 
 // wxDirDlg class for getting a directory name from user

-#define wxUSE_DIRDLG 0
+#define wxUSE_DIRDLG 1

 
 // TODO: setting to choose the generic or native one
 
 
 // TODO: setting to choose the generic or native one
 


@@ -734,21 +963,21 @@
 // Default is 1
 //
 // Recommended setting: 1 (used in many places in the library itself)
 // Default is 1
 //
 // Recommended setting: 1 (used in many places in the library itself)

-#define wxUSE_FILEDLG       0
+#define wxUSE_FILEDLG       1

 
 // Use find/replace dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (but may be safely set to 0)
 
 // Use find/replace dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (but may be safely set to 0)

-#define wxUSE_FINDREPLDLG       0
+#define wxUSE_FINDREPLDLG       1

 
 // Use font picker dialog
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
 
 // Use font picker dialog
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)

-#define wxUSE_FONTDLG       0
+#define wxUSE_FONTDLG       1

 
 // Use wxMessageDialog and wxMessageBox.
 //
 
 // Use wxMessageDialog and wxMessageBox.
 //


@@ -761,19 +990,27 @@
 #define wxUSE_PROGRESSDLG 1
 
 // support for startup tips (wxShowTip &c)
 #define wxUSE_PROGRESSDLG 1
 
 // support for startup tips (wxShowTip &c)

-#define wxUSE_STARTUP_TIPS 0
+#define wxUSE_STARTUP_TIPS 1

 
 // text entry dialog and wxGetTextFromUser function
 
 // text entry dialog and wxGetTextFromUser function

-#define wxUSE_TEXTDLG 0
+#define wxUSE_TEXTDLG 1

 
 // number entry dialog
 
 // number entry dialog

-#define wxUSE_NUMBERDLG 0
+#define wxUSE_NUMBERDLG 1

 
 // splash screen class
 
 // splash screen class

-#define wxUSE_SPLASH 0
+#define wxUSE_SPLASH 1

 
 // wizards
 
 // wizards

-#define wxUSE_WIZARDDLG 0
+#define wxUSE_WIZARDDLG 1
+
+// Compile in wxAboutBox() function showing the standard "About" dialog.
+//
+// Default is 1
+//
+// Recommended setting: 1 but can be set to 0 to save some space if you don't
+//                      use this function
+#define wxUSE_ABOUTDLG 1

 
 // ----------------------------------------------------------------------------
 // Metafiles support
 
 // ----------------------------------------------------------------------------
 // Metafiles support


@@ -792,8 +1029,8 @@
 // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
 //
 // Recommended setting: default or 0 for everything for portable programs.
 // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
 //
 // Recommended setting: default or 0 for everything for portable programs.

-#define wxUSE_METAFILE              0
-#define wxUSE_ENH_METAFILE          0
+#define wxUSE_METAFILE              1
+#define wxUSE_ENH_METAFILE          1

 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 // ----------------------------------------------------------------------------
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 // ----------------------------------------------------------------------------


@@ -807,18 +1044,18 @@
 // Default is 1.
 //
 // Recommended setting: 1, can be safely set to 0.
 // Default is 1.
 //
 // Recommended setting: 1, can be safely set to 0.

-#define wxUSE_MDI 0
+#define wxUSE_MDI 1

 
 // Set to 0 to disable document/view architecture
 
 // Set to 0 to disable document/view architecture

-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1

 
 // Set to 0 to disable MDI document/view architecture
 //
 // Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
 
 // Set to 0 to disable MDI document/view architecture
 //
 // Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE

-#define wxUSE_MDI_ARCHITECTURE    0
+#define wxUSE_MDI_ARCHITECTURE    1

 
 // Set to 0 to disable print/preview architecture code
 
 // Set to 0 to disable print/preview architecture code

-#define wxUSE_PRINTING_ARCHITECTURE  0
+#define wxUSE_PRINTING_ARCHITECTURE  1

 
 // wxHTML sublibrary allows to display HTML in wxWindow programs and much,
 // much more.
 
 // wxHTML sublibrary allows to display HTML in wxWindow programs and much,
 // much more.


@@ -827,7 +1064,7 @@
 //
 // Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
 // smaller library.
 //
 // Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
 // smaller library.

-#define wxUSE_HTML          0
+#define wxUSE_HTML          1

 
 // Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
 // headers and libraries to be able to compile the library with wxUSE_GLCANVAS
 
 // Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
 // headers and libraries to be able to compile the library with wxUSE_GLCANVAS


@@ -840,6 +1077,14 @@
 // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
 #define wxUSE_GLCANVAS       0
 
 // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
 #define wxUSE_GLCANVAS       0
 

+// wxRichTextCtrl allows editing of styled text.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 if you want compile a
+// smaller library.
+#define wxUSE_RICHTEXT       1
+

 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------


@@ -849,7 +1094,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_CLIPBOARD     0
+#define wxUSE_CLIPBOARD     1

 
 // Use wxDataObject and related classes. Needed for clipboard and OLE drag and
 // drop
 
 // Use wxDataObject and related classes. Needed for clipboard and OLE drag and
 // drop


@@ -857,7 +1102,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_DATAOBJ       0
+#define wxUSE_DATAOBJ       1

 
 // Use wxDropTarget and wxDropSource classes for drag and drop (this is
 // different from "built in" drag and drop in wxTreeCtrl which is always
 
 // Use wxDropTarget and wxDropSource classes for drag and drop (this is
 // different from "built in" drag and drop in wxTreeCtrl which is always


@@ -866,7 +1111,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_DRAG_AND_DROP 0
+#define wxUSE_DRAG_AND_DROP 1

 
 // Use wxAccessible for enhanced and customisable accessibility.
 // Depends on wxUSE_OLE.
 
 // Use wxAccessible for enhanced and customisable accessibility.
 // Depends on wxUSE_OLE.


@@ -881,69 +1126,56 @@
 // ----------------------------------------------------------------------------
 
 // wxSingleInstanceChecker class allows to verify at startup if another program
 // ----------------------------------------------------------------------------
 
 // wxSingleInstanceChecker class allows to verify at startup if another program

-// instance is running (it is only available under Win32)
+// instance is running.

 //
 // Default is 1
 //
 // Recommended setting: 1 (the class is tiny, disabling it won't save much
 // space)
 //
 // Default is 1
 //
 // Recommended setting: 1 (the class is tiny, disabling it won't save much
 // space)

-#define wxUSE_SNGLINST_CHECKER  0
+#define wxUSE_SNGLINST_CHECKER  1

 
 

-#define wxUSE_DRAGIMAGE 0
+#define wxUSE_DRAGIMAGE 1

 
 

-#define wxUSE_IPC         0
+#define wxUSE_IPC         1

                                 // 0 for no interprocess comms
                                 // 0 for no interprocess comms

-#define wxUSE_HELP        0
+#define wxUSE_HELP        1

                                 // 0 for no help facility
                                 // 0 for no help facility

-#define wxUSE_MS_HTML_HELP 0
-                                // 0 for no MS HTML Help
+
+// Should we use MS HTML help for wxHelpController? If disabled, neither
+// wxCHMHelpController nor wxBestHelpController are available.
+//
+// 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)
+#define wxUSE_MS_HTML_HELP 1
+

 
 // Use wxHTML-based help controller?
 
 // Use wxHTML-based help controller?

-#define wxUSE_WXHTML_HELP 0
+#define wxUSE_WXHTML_HELP 1

 
 

-#define wxUSE_RESOURCES   0
-                                // 0 for no wxGetResource/wxWriteResource
-#define wxUSE_CONSTRAINTS 0
+#define wxUSE_CONSTRAINTS 1

                                 // 0 for no window layout constraint system
 
                                 // 0 for no window layout constraint system
 

-#define wxUSE_SPLINES     0
+#define wxUSE_SPLINES     1

                                 // 0 for no splines
 
                                 // 0 for no splines
 

-#define wxUSE_MOUSEWHEEL        0
+#define wxUSE_MOUSEWHEEL        1

                                 // Include mouse wheel support
 
 // ----------------------------------------------------------------------------
                                 // Include mouse wheel support
 
 // ----------------------------------------------------------------------------

-// postscript support settings
+// wxDC classes for various output formats

 // ----------------------------------------------------------------------------
 
 // Set to 1 for PostScript device context.
 #define wxUSE_POSTSCRIPT  0
 
 // Set to 1 to use font metric files in GetTextExtent
 // ----------------------------------------------------------------------------
 
 // Set to 1 for PostScript device context.
 #define wxUSE_POSTSCRIPT  0
 
 // Set to 1 to use font metric files in GetTextExtent

-#define wxUSE_AFM_FOR_POSTSCRIPT 0
-
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
+#define wxUSE_AFM_FOR_POSTSCRIPT 1

 
 

-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS 0
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
+// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
+// to create fiels in SVG (Scalable Vector Graphics) format.
+#define wxUSE_SVG 1

 
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 
 // ----------------------------------------------------------------------------
 // other compiler (mis)features


@@ -958,14 +1190,15 @@
 #define REMOVE_UNUSED_ARG   1
 
 // VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
 #define REMOVE_UNUSED_ARG   1
 
 // VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix

-// them. Set to 1 for <iostream.h>, 0 for <iostream>. Note that VC++ 7.1
-// and later doesn't support wxUSE_IOSTREAMH == 1 and so <iostream> will be
-// used anyhow.
+// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.

 //
 //

-// Default is 1.
+// Note that newer compilers (including VC++ 7.1 and later) don't support
+// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.

 //
 //

-// Recommended setting: whatever your compiler likes more
-#define wxUSE_IOSTREAMH     1
+// Default is 0.
+//
+// Recommended setting: 0, only set to 1 if you use a really old compiler
+#define wxUSE_IOSTREAMH     0

 
 // ----------------------------------------------------------------------------
 // image format support
 
 // ----------------------------------------------------------------------------
 // image format support


@@ -980,111 +1213,62 @@
 // which is mentioned if it is the case.
 
 // Set to 1 for wxImage support (recommended).
 // which is mentioned if it is the case.
 
 // Set to 1 for wxImage support (recommended).

-#define wxUSE_IMAGE         0
+#define wxUSE_IMAGE         1

 
 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
 
 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.

-#define wxUSE_LIBPNG        0
+#define wxUSE_LIBPNG        1

 
 // Set to 1 for JPEG format support (requires libjpeg)
 
 // Set to 1 for JPEG format support (requires libjpeg)

-#define wxUSE_LIBJPEG       0
+#define wxUSE_LIBJPEG       1

 
 // Set to 1 for TIFF format support (requires libtiff)
 
 // Set to 1 for TIFF format support (requires libtiff)

-#define wxUSE_LIBTIFF       0
+#define wxUSE_LIBTIFF       1
+
+// Set to 1 for TGA format support (loading only)
+#define wxUSE_TGA           1

 
 // Set to 1 for GIF format support
 
 // Set to 1 for GIF format support

-#define wxUSE_GIF           0
+#define wxUSE_GIF           1

 
 // Set to 1 for PNM format support
 
 // Set to 1 for PNM format support

-#define wxUSE_PNM           0
+#define wxUSE_PNM           1

 
 // Set to 1 for PCX format support
 
 // Set to 1 for PCX format support

-#define wxUSE_PCX           0
+#define wxUSE_PCX           1

 
 // Set to 1 for IFF format support (Amiga format)
 #define wxUSE_IFF           0
 
 // Set to 1 for XPM format support
 
 // Set to 1 for IFF format support (Amiga format)
 #define wxUSE_IFF           0
 
 // Set to 1 for XPM format support

-#define wxUSE_XPM           0
+#define wxUSE_XPM           1

 
 // Set to 1 for MS Icons and Cursors format support
 
 // Set to 1 for MS Icons and Cursors format support

-#define wxUSE_ICO_CUR       0
+#define wxUSE_ICO_CUR       1

 
 // Set to 1 to compile in wxPalette class
 
 // Set to 1 to compile in wxPalette class

-#define wxUSE_PALETTE       0
+#define wxUSE_PALETTE       1

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// Windows-only settings
+// wxUniversal-only options

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           0
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT  0
-
-// TODO:  This should be ifdef'ed for any compilers that don't support
-//        RichEdit 2.0 but do have RichEdit 1.0...
-#define wxUSE_RICHEDIT2 0
-
-#else
-#define wxUSE_RICHEDIT  0
-#define wxUSE_RICHEDIT2 0
-#endif
+// Set to 1 to enable compilation of all themes, this is the default
+#define wxUSE_ALL_THEMES    1

 
 

-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 0
+// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
+// is unset, if it is set these options are not used; notice that metal theme
+// uses Win32 one
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0

 
 

-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           0

 
 

-// Set to 1 to auto-adapt to MS Windows XP themes where possible
-// (notably, wxNotebook pages)
-#define wxUSE_UXTHEME_AUTO      0
+/* --- end common options --- */

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// obsolete settings
+// PalmOS-only settings

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// NB: all settings in this section are obsolete and should not be used/changed
-//     at all, they will disappear
-
-// Define 1 to use bitmap messages.
-#define wxUSE_BITMAP_MESSAGE         0
-
-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES     1
-

 #endif
 #endif

-    // _WX_SETUP_H_
+       // _WX_SETUP_H_