X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a0c45985d34cd2a2884aaca5ba9f3689d7048a7..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/univ/setup0.h?ds=inline

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index bdac8202b2..8610adb8bf 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1,17 +1,17 @@
-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 // Name:        wx/univ/setup.h
-// Purpose:     configuration settings for wxUniversal/MSW
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.08.00
+// Purpose:     Configuration for the universal build of the library
+// Author:      Julian Smart
+// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_UNIV_SETUP_H_
-#define _WX_UNIV_SETUP_H_
+#ifndef _WX_SETUP_H_
+#define _WX_SETUP_H_
 
+/* --- start common options --- */
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
@@ -19,22 +19,24 @@
 // define this to 0 when building wxBase library - this can also be done from
 // makefile/project file overriding the value here
 #ifndef wxUSE_GUI
-    #define wxUSE_GUI 1
+    #define wxUSE_GUI            1
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.4 API: set it to 1 to
-// enable it
+// 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 instead!)
-#define WXWIN_COMPATIBILITY_2_4 0
+// Recommended setting: 0 (please update your code)
+#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
@@ -42,15 +44,16 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#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 0
+// Recommended setting: 0
+#define wxDIALOG_UNIT_COMPATIBILITY   0
 
 // ----------------------------------------------------------------------------
 // debugging settings
@@ -73,11 +76,7 @@
 // Default is 0
 //
 // Recommended setting: 0
-#ifdef __MWERKS__
-    #define wxUSE_DEBUG_CONTEXT 1
-#else
-    #define wxUSE_DEBUG_CONTEXT 0
-#endif
+#define wxUSE_DEBUG_CONTEXT 0
 
 // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
 // __WXDEBUG__ is also defined.
@@ -122,61 +121,42 @@
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.
-#ifdef _MSC_VER
-    #define wxUSE_ON_FATAL_EXCEPTION 1
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 1
 
-// ----------------------------------------------------------------------------
-// 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).
+// 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 0
+// Default is 1 if supported by the compiler.
 //
-// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 0
-#endif
+// Recommended setting: 1, set to 0 if your programs never crash
+#define wxUSE_STACKWALKER 1
 
-// 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/Articles/mslu_announce.asp). Note that you
-// will have to modify the makefiles to include unicows.lib import library as the first
-// library (if you use MSVC, you can run the makefile with "nmake MSLU=1 UNICODE=1"
-// command).
+// 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.
 //
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
+// Default is 1 if supported by the compiler.
 //
-// Recommended setting: 0
-#define wxUSE_UNICODE_MSLU 0
+// 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
 
-// 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 for win32 else 0
-#if defined(__WIN32__) || defined(__WATCOMC__)
-    #define wxUSE_WCHAR_T 1
-#else
-    #define wxUSE_WCHAR_T 0
+// ----------------------------------------------------------------------------
+// Unicode support
+// ----------------------------------------------------------------------------
+
+// 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
+    #define wxUSE_UNICODE 1
 #endif
 
+// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
+#define wxUSE_WCHAR_T 1
+
 // ----------------------------------------------------------------------------
 // global features
 // ----------------------------------------------------------------------------
@@ -188,12 +168,22 @@
 // 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
 //                      in your own code (1 if you do, 0 if you don't)
 #define wxUSE_EXCEPTIONS    1
 
+// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
+//
+// Default is 0
+//
+// Recommended setting: 0 (this is still work in progress...)
+#define wxUSE_EXTENDED_RTTI 0
+
 // 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.
@@ -203,13 +193,6 @@
 // Recommended setting: YMMV
 #define wxUSE_STL 0
 
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_EXTENDED_RTTI 0
-
 // Support for message/error logging. This includes wxLogXXX() functions and
 // wxLog and derived classes. Don't set this to 0 unless you really know what
 // you are doing.
@@ -241,23 +224,74 @@
 // 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
 #define wxUSE_THREADS 1
 
-// If enabled (1), compiles wxWidgets streams classes
-#define wxUSE_STREAMS 1
+// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
+// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
+// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
+// in this area, Visual C compiler options "/vmm /vmg" may help then).
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_WEAKREF 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
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
-#ifdef __MWERKS__
-    #define wxUSE_STD_IOSTREAM 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_IOSTREAM 0
+    #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
+
+// 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
+
 // 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
@@ -271,7 +305,7 @@
 // Default is 1
 //
 // Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      0
+#define wxUSE_PRINTF_POS_PARAMS      1
 
 // ----------------------------------------------------------------------------
 // non GUI features selection
@@ -288,7 +322,25 @@
 // off.
 //
 // Recommended setting: 1
-#define wxUSE_LONGLONG 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.
@@ -297,15 +349,15 @@
 //
 // Recommended setting: 1 (wxFile is highly recommended as it is required by
 // i18n code, wxFileConfig and others)
-#define wxUSE_FILE 1
-#define wxUSE_FFILE 1
+#define wxUSE_FILE          1
+#define wxUSE_FFILE         1
 
 // Use wxFSVolume class providing access to the configured/active mount points
 //
 // Default is 1
 //
 // Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME 1
+#define wxUSE_FSVOLUME      1
 
 // Use wxStandardPaths class which allows to retrieve some standard locations
 // in the file system
@@ -316,14 +368,29 @@
 #define wxUSE_STDPATHS      1
 
 // use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER 1
+#define wxUSE_TEXTBUFFER    1
 
 // use wxTextFile class: requires wxFile and wxTextBuffer, required by
 // wxFileConfig
-#define wxUSE_TEXTFILE 1
+#define wxUSE_TEXTFILE      1
 
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL 1
+#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
@@ -340,30 +407,21 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_DATETIME 1
-
-// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
-// the same as wxDateTime!). These classes are obsolete and shouldn't be used
-// in new code
-//
-// Default is 0
-//
-// Recommended setting: 0 unless you have legacy code which uses these classes
-#define wxUSE_TIMEDATE 0
+#define wxUSE_DATETIME      1
 
 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_TIMER 1
+#define wxUSE_TIMER         1
 
 // Use wxStopWatch clas.
 //
 // Default is 1
 //
 // Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH 1
+#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
@@ -373,7 +431,7 @@
 // See also wxUSE_CONFIG_NATIVE below.
 //
 // Recommended setting: 1
-#define wxUSE_CONFIG 1
+#define wxUSE_CONFIG        1
 
 // If wxUSE_CONFIG is 1, you may choose to use either the native config
 // classes under Windows (using .INI files under Win16 and the registry under
@@ -385,12 +443,8 @@
 // default for the applications needs will be a wxRegConfig or wxIniConfig and
 // not wxFileConfig.
 //
-// Recommended setting: 0 (universal should not use native)
-#if defined(__WIN32__)
-    #define wxUSE_CONFIG_NATIVE 0
-#else
-    #define wxUSE_CONFIG_NATIVE 0
-#endif
+// Recommended setting: 1
+#define wxUSE_CONFIG_NATIVE   1
 
 // If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
 // to connect/disconnect from the network and be notified whenever the dial-up
@@ -399,11 +453,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#if defined(__WIN32__)
-    #define wxUSE_DIALUP_MANAGER 1
-#else
-    #define wxUSE_DIALUP_MANAGER 0
-#endif
+#define wxUSE_DIALUP_MANAGER   1
 
 // Compile in classes for run-time DLL loading and function calling.
 // Required by wxUSE_DIALUP_MANAGER.
@@ -413,41 +463,50 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#if defined(__WIN32__)
-    #define wxUSE_DYNLIB_CLASS 1
-#else
-    #define wxUSE_DYNLIB_CLASS 0
-#endif
+#define wxUSE_DYNLIB_CLASS    1
 
 // experimental, don't use for now
-#if defined(__WIN32__)
-    #define wxUSE_DYNAMIC_LOADER 1
-#else
-    #define wxUSE_DYNAMIC_LOADER 0
-#endif
+#define wxUSE_DYNAMIC_LOADER  1
 
 // Set to 1 to use socket classes
-#define wxUSE_SOCKETS 1
+#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)
-#define wxUSE_FILESYSTEM 1
+#define wxUSE_FILESYSTEM    1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP 1
+#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)
+#define wxUSE_FS_INET       1
 
 // wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS 1
+#define wxUSE_ARCHIVE_STREAMS     1
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM 1
+#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
 #define wxUSE_ZLIB          1
 
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET 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
 // from wxWidgets one.
@@ -455,14 +514,13 @@
 // Default is 1.
 //
 // Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE 1
+#define wxUSE_APPLE_IEEE          1
 
 // Joystick support class
-#if defined(__WIN32__)
-    #define wxUSE_JOYSTICK 1
-#else
-    #define wxUSE_JOYSTICK 1
-#endif
+#define wxUSE_JOYSTICK            1
+
+// wxFontEnumerator class
+#define wxUSE_FONTENUM 1
 
 // wxFontMapper class
 #define wxUSE_FONTMAP 1
@@ -486,6 +544,16 @@
 // Define this to use wxURL class.
 #define wxUSE_URL 1
 
+// Define this to use native platform url and protocol support.
+// Currently valid only for MS-Windows.
+// Note: if you set this to 1, you can open ftp/http/gopher sites
+// and obtain a valid input stream for these sites
+// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
+// Doing so reduces the code size.
+//
+// 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.
 //
@@ -503,13 +571,13 @@
 //
 // 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 1
+#define wxUSE_REGEX       1
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
 
 // wxSound class
-#define wxUSE_SOUND 1
+#define wxUSE_SOUND      1
 
 // Use wxMediaCtrl
 //
@@ -518,19 +586,12 @@
 // Recommended setting: 1
 #define wxUSE_MEDIACTRL     1
 
-// Use QuickTime
+// Use GStreamer for Unix (req a lot of dependancies)
 //
 // Default is 0
 //
-// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
-#define wxUSE_QUICKTIME     0
-
-// Use DirectShow
-//
-// Default is 0
-//
-// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
-#define wxUSE_DIRECTSHOW    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.
 //
@@ -542,14 +603,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
 //
@@ -558,6 +615,13 @@
 // 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)
@@ -573,13 +637,6 @@
 #define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
-// 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
-
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------
@@ -617,37 +674,41 @@
 // Default is 1
 //
 // Recommended setting: 1
-#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
-#define wxUSE_CHOICE           1    // wxChoice
+#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_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_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    // wxToggleButton
-#define wxUSE_TREECTRL         1    // wxTreeCtrl
+#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
 // below either wxStatusBar95 or a generic wxStatusBar will be used.
@@ -655,29 +716,29 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_STATUSBAR 1
+#define wxUSE_STATUSBAR    1
 
 // 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.
 //
-// Default is 0.
+// Default is 1 for the platforms where native status bar is supported.
 //
-// Recommended setting: 0
-#define wxUSE_NATIVE_STATUSBAR 0
+// Recommended setting: 1 (there is no advantage in using the generic one)
+#define wxUSE_NATIVE_STATUSBAR        1
 
 // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
 // classes at all. Otherwise, use the native toolbar class unless
 // wxUSE_TOOLBAR_NATIVE is 0.
 //
-// Default is 0 for all settings.
+// Default is 1 for all settings.
 //
-// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE.
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
 #define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 0
+#define wxUSE_TOOLBAR_NATIVE 1
 
 // 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.
 //
@@ -724,7 +785,15 @@
 // Default is 0.
 //
 // Recommended setting: 0 (use wxNotebook)
-#define wxUSE_TAB_DIALOG 0
+#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
 //
@@ -733,10 +802,14 @@
 //
 // Recommended setting: 1
 //
-#define wxUSE_GRID 1
+#define wxUSE_GRID         1
 
-// wxProperty[Value/Form/List] classes, used by Dialog Editor
-#define wxUSE_PROPSHEET 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.
@@ -756,7 +829,7 @@
 //                      needed as a base class for generic wxBitmapComboBox.
 #define wxUSE_ODCOMBOBOX 1
 
-// wxBitmapComboBox a combobox that can have images in front of text items.
+// wxBitmapComboBox is a combobox that can have images in front of text items.
 //
 // Default is 1.
 //
@@ -770,24 +843,28 @@
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
 #define wxUSE_ACCEL 1
 
+// Hotkey support (currently Windows only)
+#define wxUSE_HOTKEY 1
+
 // Use wxCaret: a class implementing a "cursor" in a text control (called caret
 // under Windows).
 //
 // Default is 1.
 //
 // Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET 1
+#define wxUSE_CARET         1
 
 // 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
-#define wxUSE_DISPLAY       0
+#define wxUSE_DISPLAY       1
 
 // 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.
@@ -796,49 +873,63 @@
 //
 // 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 1
+#define wxUSE_IMAGLIST      1
 
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //
 // Default is 1.
 //
 // Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS 1
+#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
-#define wxUSE_SASH 1
+#define wxUSE_SASH          1
 
 // Use wxSplitterWindow class.
 //
 // Default is 1.
 //
 // Recommended setting: 1
-#define wxUSE_SPLITTER 1
+#define wxUSE_SPLITTER      1
 
 // Use wxToolTip and wxWindow::Set/GetToolTip() methods.
 //
 // Default is 1.
 //
 // Recommended setting: 1
-#ifdef __WIN32__
-    #define wxUSE_TOOLTIPS 1
-#else
-    #define wxUSE_TOOLTIPS 0
-#endif
+#define wxUSE_TOOLTIPS      1
 
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS 1
 
-// wxDC cacheing implementation
-#define wxUSE_DC_CACHEING 1
-
-// 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
+// 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
@@ -855,21 +946,21 @@
 
 // wxBusyInfo displays window with message when app is busy. Works in same way
 // as wxBusyCursor
-#define wxUSE_BUSYINFO 1
+#define wxUSE_BUSYINFO      1
 
 // Use single/multiple choice dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG 1
+#define wxUSE_CHOICEDLG     1
 
 // Use colour picker dialog
 //
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_COLOURDLG 1
+#define wxUSE_COLOURDLG     1
 
 // wxDirDlg class for getting a directory name from user
 #define wxUSE_DIRDLG 1
@@ -881,32 +972,28 @@
 // Default is 1
 //
 // Recommended setting: 1 (used in many places in the library itself)
-#if defined(__WIN32__)
-    #define wxUSE_FILEDLG 1
-#else
-    #define wxUSE_FILEDLG 1
-#endif
+#define wxUSE_FILEDLG       1
 
 // Use find/replace dialogs.
 //
 // Default is 1
 //
 // Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG 1
+#define wxUSE_FINDREPLDLG       1
 
 // Use font picker dialog
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG 1
+#define wxUSE_FONTDLG       1
 
 // Use wxMessageDialog and wxMessageBox.
 //
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG 1
+#define wxUSE_MSGDLG        1
 
 // progress dialog class for lengthy operations
 #define wxUSE_PROGRESSDLG 1
@@ -951,15 +1038,9 @@
 // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
 //
 // Recommended setting: default or 0 for everything for portable programs.
-#if defined(__WIN32__)
-    #define wxUSE_METAFILE 1
-    #define wxUSE_ENH_METAFILE 1
-    #define wxUSE_WIN_METAFILES_ALWAYS 0
-#else
-    #define wxUSE_METAFILE 0
-    #define wxUSE_ENH_METAFILE 0
-    #define wxUSE_WIN_METAFILES_ALWAYS 0
-#endif
+#define wxUSE_METAFILE              1
+#define wxUSE_ENH_METAFILE          1
+#define wxUSE_WIN_METAFILES_ALWAYS  0
 
 // ----------------------------------------------------------------------------
 // Big GUI components
@@ -980,10 +1061,10 @@
 // Set to 0 to disable MDI document/view architecture
 //
 // Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE 1
+#define wxUSE_MDI_ARCHITECTURE    1
 
 // Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE 1
+#define wxUSE_PRINTING_ARCHITECTURE  1
 
 // wxHTML sublibrary allows to display HTML in wxWindow programs and much,
 // much more.
@@ -992,7 +1073,7 @@
 //
 // Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
 // smaller library.
-#define wxUSE_HTML 1
+#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
@@ -1003,11 +1084,7 @@
 // Default is 0.
 //
 // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#if defined(__WIN32__)
-    #define wxUSE_GLCANVAS 1
-#else
-    #define wxUSE_GLCANVAS 0
-#endif
+#define wxUSE_GLCANVAS       0
 
 // wxRichTextCtrl allows editing of styled text.
 //
@@ -1017,9 +1094,6 @@
 // smaller library.
 #define wxUSE_RICHTEXT       1
 
-// wxTreeLayout class
-#define wxUSE_TREELAYOUT 1
-
 // ----------------------------------------------------------------------------
 // Data transfer
 // ----------------------------------------------------------------------------
@@ -1029,15 +1103,15 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#define wxUSE_CLIPBOARD 1
+#define wxUSE_CLIPBOARD     1
 
 // Use wxDataObject and related classes. Needed for clipboard and OLE drag and
 // drop
 //
 // Default is 1.
 //
-// Recommended setting: 1 for WIN32
-#define wxUSE_DATAOBJ 1
+// Recommended setting: 1
+#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
@@ -1046,11 +1120,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#if defined(__WIN32__)
-    #define wxUSE_DRAG_AND_DROP 1
-#else
-    #define wxUSE_DRAG_AND_DROP 0
-#endif
+#define wxUSE_DRAG_AND_DROP 1
 
 // Use wxAccessible for enhanced and customisable accessibility.
 // Depends on wxUSE_OLE.
@@ -1065,81 +1135,56 @@
 // ----------------------------------------------------------------------------
 
 // 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)
-#if defined(__WIN32__)
-    #define wxUSE_SNGLINST_CHECKER 1
-#else
-    #define wxUSE_SNGLINST_CHECKER 0
-#endif
+#define wxUSE_SNGLINST_CHECKER  1
 
-// Drag image
 #define wxUSE_DRAGIMAGE 1
 
-// Interprocess communication
-#define wxUSE_IPC 1
-
-// Help
-#if defined(__WIN32__)
-    #define wxUSE_HELP 1
-#else
-    #define wxUSE_HELP 1
-#endif
+#define wxUSE_IPC         1
+                                // 0 for no interprocess comms
+#define wxUSE_HELP        1
+                                // 0 for no help facility
 
-// MS 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
-#define wxUSE_WXHTML_HELP 1
 
-// Use resources
-#define wxUSE_RESOURCES 0
+// Use wxHTML-based help controller?
+#define wxUSE_WXHTML_HELP 1
 
-// Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
+                                // 0 for no window layout constraint system
 
-// Splines
-#define wxUSE_SPLINES 1
+#define wxUSE_SPLINES     1
+                                // 0 for no splines
 
-// Include mouse wheel support
-#define wxUSE_MOUSEWHEEL 1
+#define wxUSE_MOUSEWHEEL        1
+                                // Include mouse wheel support
 
 // ----------------------------------------------------------------------------
-// postscript support settings
+// wxDC classes for various output formats
 // ----------------------------------------------------------------------------
 
 // Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT 1
+#define wxUSE_POSTSCRIPT  0
 
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC 1
-
-// 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
@@ -1151,19 +1196,18 @@
 // Default is 1.
 //
 // Recommended setting: 1 (should never need to set this to 0)
-#define REMOVE_UNUSED_ARG 1
+#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>
+// 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
-#ifdef __MWERKS__
-    #define wxUSE_IOSTREAMH 1
-#else
-    #define wxUSE_IOSTREAMH 0
-#endif
+// Default is 0.
+//
+// Recommended setting: 0, only set to 1 if you use a really old compiler
+#define wxUSE_IOSTREAMH     0
 
 // ----------------------------------------------------------------------------
 // image format support
@@ -1178,42 +1222,81 @@
 // which is mentioned if it is the case.
 
 // Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE 1
+#define wxUSE_IMAGE         1
 
 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG 1
+#define wxUSE_LIBPNG        1
 
 // Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG 1
+#define wxUSE_LIBJPEG       1
 
 // Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF 1
+#define wxUSE_LIBTIFF       1
+
+// Set to 1 for TGA format support (loading only)
+#define wxUSE_TGA           1
 
 // Set to 1 for GIF format support
-#define wxUSE_GIF 1
+#define wxUSE_GIF           1
 
 // Set to 1 for PNM format support
-#define wxUSE_PNM 1
+#define wxUSE_PNM           1
 
 // Set to 1 for PCX format support
-#define wxUSE_PCX 1
+#define wxUSE_PCX           1
 
 // Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF 0
+#define wxUSE_IFF           0
 
 // Set to 1 for XPM format support
-#define wxUSE_XPM 1
+#define wxUSE_XPM           1
 
 // 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
- #define wxUSE_PALETTE 1
+#define wxUSE_PALETTE       1
+
+// ----------------------------------------------------------------------------
+// wxUniversal-only options
+// ----------------------------------------------------------------------------
+
+// Set to 1 to enable compilation of all themes, this is the default
+#define wxUSE_ALL_THEMES    1
+
+// 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
 
+
+/* --- end common options --- */
+
+/* --- start MSW options --- */
 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------
-#if defined(__WINDOWS__)
+
+// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
+// and want to run your programs under Windows 9x and not only 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)
+#ifndef wxUSE_UNICODE_MSLU
+    #define wxUSE_UNICODE_MSLU 0
+#endif
 
 // Set this to 1 if you want to use wxWidgets and MFC in the same program. This
 // will override some other settings (see below)
@@ -1221,7 +1304,7 @@
 // Default is 0.
 //
 // Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC 0
+#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
@@ -1229,16 +1312,46 @@
 //
 // Default is 1.
 //
-// Recommended setting: 1 for WIN32
-    #define wxUSE_OLE 1
+// Recommended setting: 1
+#define wxUSE_OLE           1
+
+// Set this to 1 to enable wxAutomationObject class.
+//
+// Default is 1.
+//
+// Recommended setting: 1 if you need to control other applications via OLE
+// Automation, can be safely set to 0 otherwise
+#define wxUSE_OLE_AUTOMATION 1
+
+// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
+// controls in wx.
+//
+// Default is 1.
+//
+// Recommended setting: 1, required by wxMediaCtrl
+#define wxUSE_ACTIVEX 1
+
+// wxDC cacheing implementation
+#define wxUSE_DC_CACHEING 1
+
+// Set this to 1 to enable wxDIB class used internally for manipulating
+// wxBitmap data.
+//
+// Default is 1, set it to 0 only if you don't use wxImage neither
+//
+// Recommended setting: 1 (without it conversion to/from wxImage won't work)
+#define wxUSE_WXDIB 1
 
 // Set to 0 to disable PostScript print/preview architecture code under Windows
 // (just use Windows printing).
-#if defined(__WIN32__)
-    #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-#else
-    #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-#endif
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+// Set this to 1 to compile in wxRegKey class.
+//
+// Default is 1
+//
+// Recommended setting: 1, this is used internally by wx in a few places
+#define wxUSE_REGKEY 1
 
 // 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
@@ -1248,23 +1361,60 @@
 //
 // 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__)
-// TODO:  This should be ifdef'ed for any compilers that don't support
-//        RichEdit 2.0 but do have RichEdit 1.0...
-    #define wxUSE_RICHEDIT 0 // currently not supported
-    #define wxUSE_RICHEDIT2 0 // currently not supported
+#define wxUSE_RICHEDIT  1
 
-#else
-    #define wxUSE_RICHEDIT 0
-    #define wxUSE_RICHEDIT2 0
-#endif
+// Set this to 1 to use extra features of richedit v2 and later controls
+//
+// Default is 1 for compilers which support it
+//
+// Recommended setting: 1
+#define wxUSE_RICHEDIT2 1
 
-// Set this to 1 to enable support for the owner-drawn menu and listboxes.
+// 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
+#define wxUSE_OWNER_DRAWN 1
+
+// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
+// is required by native wxNotificationMessage implementation.
+//
+// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
+// the necessary declarations.
+//
+// Recommended setting: 1, set to 0 for a tiny library size reduction
+#define wxUSE_TASKBARICON_BALLOONS 1
+
+// Set to 1 to compile MS Windows XP theme engine support
+#define wxUSE_UXTHEME           1
+
+// Set to 1 to use InkEdit control (Tablet PC), if available
+#define wxUSE_INKEDIT  0
+
+// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
+//
+// Default is 0.
+//
+// Recommended setting: 0, nobody uses .INI files any more
+#define wxUSE_INICONF 0
+
+// ----------------------------------------------------------------------------
+// Generic versions of native controls
+// ----------------------------------------------------------------------------
+
+// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
+// native wxDatePickerCtrl
+//
+// Default is 0.
+//
+// Recommended setting: 0, this is mainly used for testing
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+// ----------------------------------------------------------------------------
+// Crash debugging helpers
+// ----------------------------------------------------------------------------
 
 // Set this to 1 to be able to use wxCrashReport::Generate() to create mini
 // dumps of your program when it crashes (or at any other moment)
@@ -1273,22 +1423,24 @@
 //
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 1
+/* --- end MSW options --- */
 
-#endif
-
+/* --- start wxUniv options --- */
 // ----------------------------------------------------------------------------
-// unknown settings
+// wxUniversal-only options
 // ----------------------------------------------------------------------------
 
-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES 1
+// Set to 1 to enable compilation of all themes, this is the default
+#define wxUSE_ALL_THEMES    1
 
-//??????
-#if defined(__WIN32__)
-    #define wxUSE_DDE_FOR_IPC 0
-#else
-    #define wxUSE_DDE_FOR_IPC 0
-#endif
+// 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
+/* --- end wxUniv options --- */
+
+#endif // _WX_SETUP_H_
 
-#endif // _WX_UNIV_SETUP_H_