wxDisplay cleanup/rewrite:

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

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index ee6faa2f04ad48366641d6dd173ada2c7c253c5a..832905f4f20a180f42da0798004047cea81e7530 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,15 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 2.2 API: set it to 1 to
+// This setting determines the compatibility with 2.4 API: set it to 1 to

 // enable it but please consider updating your code instead.
 //
 // Default is 0
 //
 // Recommended setting: 0 (please update your code)
 // enable it but please consider updating your code instead.
 //
 // Default is 0
 //
 // Recommended setting: 0 (please update your code)

-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_4 0

 
 

-// This setting determines the compatibility with 2.4 API: set it to 0 to
+// This setting determines the compatibility with 2.6 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 +43,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_4 0
+#define WXWIN_COMPATIBILITY_2_6 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,12 +120,26 @@
 // 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


@@ -144,22 +160,6 @@
     #define wxUSE_UNICODE 0
 #endif
 
     #define wxUSE_UNICODE 0
 #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
 // 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


@@ -168,7 +168,7 @@
 // Default is 1
 //
 // Recommended setting: 1
 // Default is 1
 //
 // Recommended setting: 1

-#define wxUSE_WCHAR_T 0
+#define wxUSE_WCHAR_T 1

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


@@ -181,6 +181,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 +194,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 +213,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,19 +237,24 @@
 // 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 (1), compiles wxWidgets streams classes
 
 // If enabled (1), compiles wxWidgets streams classes

-#define wxUSE_STREAMS       0
+#define wxUSE_STREAMS       1

 
 

-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.

 #define wxUSE_STD_IOSTREAM  0
 
 #define wxUSE_STD_IOSTREAM  0
 

+// Enable conversion to standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+

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


@@ -276,8 +279,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 +298,14 @@
 #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

 
 // 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 +329,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 +368,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 +378,32 @@
 // 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 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 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 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 +412,16 @@
 // 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

 
 // 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 +429,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.


@@ -454,22 +457,34 @@
 //
 // 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.


@@ -501,7 +516,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 +524,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


@@ -521,43 +536,43 @@
 //
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton
 //
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton

-#define wxUSE_BMPBUTTON    0    // wxBitmapButton
-#define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
+#define wxUSE_BMPBUTTON    1    // wxBitmapButton
+#define wxUSE_CALENDARCTRL 1    // wxCalendarCtrl

 #define wxUSE_CHECKBOX     1    // wxCheckBox
 #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_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHOICE       1    // wxChoice
+#define wxUSE_COMBOBOX     1    // wxComboBox

 #define wxUSE_DATEPICKCTRL 1    // wxDatePickerCtrl
 #define wxUSE_DATEPICKCTRL 1    // wxDatePickerCtrl

-#define wxUSE_GAUGE        0    // wxGauge
-#define wxUSE_LISTBOX      0    // wxListBox
-#define wxUSE_LISTCTRL     0    // wxListCtrl
+#define wxUSE_GAUGE        1    // wxGauge
+#define wxUSE_LISTBOX      1    // wxListBox
+#define wxUSE_LISTCTRL     1    // wxListCtrl

 #define wxUSE_RADIOBOX     1    // wxRadioBox
 #define wxUSE_RADIOBTN     1    // wxRadioButton
 #define wxUSE_RADIOBOX     1    // wxRadioBox
 #define wxUSE_RADIOBTN     1    // wxRadioButton

-#define wxUSE_SCROLLBAR    0    // wxScrollBar
+#define wxUSE_SCROLLBAR    1    // wxScrollBar

 #define wxUSE_SLIDER       1    // wxSlider
 #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_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_STATTEXT     1    // wxStaticText

-#define wxUSE_STATBMP      0    // wxStaticBitmap
-#define wxUSE_TEXTCTRL     0    // wxTextCtrl
+#define wxUSE_STATBMP      1    // wxStaticBitmap
+#define wxUSE_TEXTCTRL     1    // wxTextCtrl

 #define wxUSE_TOGGLEBTN    1    // requires wxButton
 #define wxUSE_TOGGLEBTN    1    // requires wxButton

-#define wxUSE_TREECTRL     0    // wxTreeCtrl
+#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 +584,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 +603,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 +611,15 @@
 // 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

 
 // 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.


@@ -608,21 +631,29 @@
 
 // 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

 
 // ----------------------------------------------------------------------------
 // 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,7 +661,7 @@
 // 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
 // working with them.
 
 // Use wxDisplay class: it allows enumerating all displays on a system and
 // working with them.


@@ -641,7 +672,7 @@
 #define wxUSE_DISPLAY       0
 
 // Miscellaneous geometry code: needed for Canvas library
 #define wxUSE_DISPLAY       0
 
 // 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 +681,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.
 //


@@ -664,34 +695,24 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // 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

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


@@ -704,18 +725,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 +746,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 +755,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 +782,19 @@
 #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

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


@@ -792,8 +813,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 +828,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 +848,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 +861,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 +878,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 +886,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 +895,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.


@@ -887,29 +916,29 @@
 //
 // Recommended setting: 1 (the class is tiny, disabling it won't save much
 // space)
 //
 // 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
+#define wxUSE_MS_HTML_HELP 1

                                 // 0 for no MS HTML Help
 
 // Use wxHTML-based help controller?
                                 // 0 for no MS HTML Help
 
 // 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_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
 
 // ----------------------------------------------------------------------------


@@ -920,7 +949,7 @@
 #define wxUSE_POSTSCRIPT  0
 
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_POSTSCRIPT  0
 
 // Set to 1 to use font metric files in GetTextExtent

-#define wxUSE_AFM_FOR_POSTSCRIPT 0
+#define wxUSE_AFM_FOR_POSTSCRIPT 1

 
 // ----------------------------------------------------------------------------
 // database classes
 
 // ----------------------------------------------------------------------------
 // database classes


@@ -936,7 +965,7 @@
 // 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.
 // 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
+#define wxODBC_FWD_ONLY_CURSORS         1

 
 // 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
 
 // 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


@@ -980,111 +1009,43 @@
 // 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 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
-
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// 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
+#define wxUSE_PALETTE       1

 
 

-#else
-#define wxUSE_RICHEDIT  0
-#define wxUSE_RICHEDIT2 0
-#endif
-
-// 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 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_