diff --git a/build/update-setup-h b/build/update-setup-h
index 39c854ae0b..fc422ac586 100755
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -41,8 +41,8 @@ update_single_setup_h include/wx/msw/setup0.h
 update_single_setup_h include/wx/mac/setup0.h
 
 # get rid of C++ comments in this file
-#update_single_setup_h setup.h.in
-#sed -i -e '/^\/\//d' -e 's@ *//.*$@@' setup.h.in
+update_single_setup_h setup.h.in
+sed -i -e '/^\/\//d' -e 's@ *//.*$@@' setup.h.in
 
 exit $rc
 
diff --git a/setup.h.in b/setup.h.in
index 3c2e778e31..8c1291e681 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -137,6 +137,355 @@
 /* OS/2 with EMX */
 #undef __OS2__
 
+/* --- start common options --- */
+
+
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI            1
+#endif
+
+
+#define WXWIN_COMPATIBILITY_2_2 0
+
+#define WXWIN_COMPATIBILITY_2_4 1
+
+#define wxDIALOG_UNIT_COMPATIBILITY   1
+
+
+
+#define wxUSE_DEBUG_CONTEXT 0
+
+#define wxUSE_MEMORY_TRACING 0
+
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+
+#if defined(_MSC_VER) || \
+    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
+    #define wxUSE_ON_FATAL_EXCEPTION 1
+#else
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+#endif
+
+
+#ifndef wxUSE_UNICODE
+    #define wxUSE_UNICODE 0
+#endif
+
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_WCHAR_T 1
+
+
+#define wxUSE_EXCEPTIONS    1
+
+#define wxUSE_EXTENDED_RTTI 0
+
+#if defined(__BORLANDC__)
+#undef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 1
+#endif
+
+#define wxUSE_STL 0
+
+#define wxUSE_LOG 1
+
+#define wxUSE_LOGWINDOW 1
+
+#define wxUSE_LOGGUI 1
+
+#define wxUSE_LOG_DIALOG 1
+
+#define wxUSE_CMDLINE_PARSER 1
+
+#define wxUSE_THREADS 1
+
+#define wxUSE_STREAMS       1
+
+#define wxUSE_STD_IOSTREAM  0
+
+
+#define wxUSE_LONGLONG      1
+
+#define wxUSE_FILE          1
+#define wxUSE_FFILE         1
+
+#define wxUSE_FSVOLUME      1
+
+#define wxUSE_TEXTBUFFER    1
+
+#define wxUSE_TEXTFILE      1
+
+#define wxUSE_INTL          1
+
+#define wxUSE_DATETIME      1
+
+#define wxUSE_TIMER         1
+
+#define wxUSE_STOPWATCH     1
+
+#define wxUSE_CONFIG        1
+
+#define wxUSE_CONFIG_NATIVE   1
+
+#define wxUSE_DIALUP_MANAGER   1
+
+#define wxUSE_DYNLIB_CLASS    1
+
+#define wxUSE_DYNAMIC_LOADER  1
+
+#define wxUSE_SOCKETS       1
+
+#define wxUSE_FILESYSTEM    1
+
+#define wxUSE_FS_ZIP        1
+
+#define wxUSE_FS_INET       1
+
+#define wxUSE_ZIPSTREAM     1
+
+#define wxUSE_ZLIB          1
+
+#define wxUSE_APPLE_IEEE          1
+
+#define wxUSE_JOYSTICK            1
+
+#define wxUSE_FONTMAP 1
+
+#define wxUSE_MIMETYPE 1
+
+#define wxUSE_PROTOCOL 1
+
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+#define wxUSE_URL 1
+
+#define wxUSE_URL_NATIVE 0
+
+#define wxUSE_REGEX       1
+
+#define wxUSE_SYSTEM_OPTIONS 1
+
+#define wxUSE_SOUND      1
+
+#define wxUSE_MEDIACTRL     1
+
+#define wxUSE_QUICKTIME     0
+
+#define wxUSE_DIRECTSHOW    0
+
+#define wxUSE_XRC       1
+
+#if wxUSE_XRC
+#  define wxUSE_XML       1
+#else
+#  define wxUSE_XML       0
+#endif
+
+
+#define wxUSE_CONTROLS     1
+
+#define wxUSE_POPUPWIN     1
+
+#define wxUSE_TIPWINDOW    1
+
+#define wxUSE_BUTTON       1
+#define wxUSE_BMPBUTTON    1
+#define wxUSE_CALENDARCTRL 1
+#define wxUSE_CHECKBOX     1
+#define wxUSE_CHECKLISTBOX 1
+#define wxUSE_CHOICE       1
+#define wxUSE_COMBOBOX     1
+#define wxUSE_DATEPICKCTRL 1
+#define wxUSE_GAUGE        1
+#define wxUSE_LISTBOX      1
+#define wxUSE_LISTCTRL     1
+#define wxUSE_RADIOBOX     1
+#define wxUSE_RADIOBTN     1
+#define wxUSE_SCROLLBAR    1
+#define wxUSE_SLIDER       1
+#define wxUSE_SPINBTN      1
+#define wxUSE_SPINCTRL     1
+#define wxUSE_STATBOX      1
+#define wxUSE_STATLINE     1
+#define wxUSE_STATTEXT     1
+#define wxUSE_STATBMP      1
+#define wxUSE_TEXTCTRL     1
+#define wxUSE_TOGGLEBTN    1
+#define wxUSE_TREECTRL     1
+
+#define wxUSE_STATUSBAR    1
+
+#define wxUSE_NATIVE_STATUSBAR        1
+
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
+
+#define wxUSE_NOTEBOOK 1
+
+#define wxUSE_LISTBOOK 1
+
+#define wxUSE_CHOICEBOOK 1
+
+#define wxUSE_TAB_DIALOG    0
+
+#define wxUSE_GRID         1
+
+
+#define wxUSE_ACCEL 1
+
+#define wxUSE_HOTKEY 1
+
+#define wxUSE_CARET         1
+
+#define wxUSE_DISPLAY       0
+
+#define wxUSE_GEOMETRY            1
+
+#define wxUSE_IMAGLIST      1
+
+#define wxUSE_MENUS         1
+
+#define wxUSE_SASH          1
+
+#define wxUSE_SPLITTER      1
+
+#define wxUSE_TOOLTIPS      1
+
+#define wxUSE_VALIDATORS 1
+
+
+#define wxUSE_COMMON_DIALOGS 1
+
+#define wxUSE_BUSYINFO      1
+
+#define wxUSE_CHOICEDLG     1
+
+#define wxUSE_COLOURDLG     1
+
+#define wxUSE_DIRDLG 1
+
+
+#define wxUSE_FILEDLG       1
+
+#define wxUSE_FINDREPLDLG       1
+
+#define wxUSE_FONTDLG       1
+
+#define wxUSE_MSGDLG        1
+
+#define wxUSE_PROGRESSDLG 1
+
+#define wxUSE_STARTUP_TIPS 1
+
+#define wxUSE_TEXTDLG 1
+
+#define wxUSE_NUMBERDLG 1
+
+#define wxUSE_SPLASH 1
+
+#define wxUSE_WIZARDDLG 1
+
+
+#define wxUSE_METAFILE              1
+#define wxUSE_ENH_METAFILE          1
+#define wxUSE_WIN_METAFILES_ALWAYS  0
+
+
+#define wxUSE_MDI 1
+
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+
+#define wxUSE_MDI_ARCHITECTURE    1
+
+#define wxUSE_PRINTING_ARCHITECTURE  1
+
+#define wxUSE_HTML          1
+
+#define wxUSE_GLCANVAS       0
+
+
+#define wxUSE_CLIPBOARD     1
+
+#define wxUSE_DATAOBJ       1
+
+#define wxUSE_DRAG_AND_DROP 1
+
+#define wxUSE_ACCESSIBILITY 0
+
+
+#define wxUSE_SNGLINST_CHECKER  1
+
+#define wxUSE_DRAGIMAGE 1
+
+#define wxUSE_IPC         1
+
+#define wxUSE_HELP        1
+
+#define wxUSE_MS_HTML_HELP 1
+
+
+#define wxUSE_WXHTML_HELP 1
+
+#define wxUSE_RESOURCES   0
+
+#define wxUSE_CONSTRAINTS 1
+
+
+#define wxUSE_SPLINES     1
+
+
+#define wxUSE_MOUSEWHEEL        1
+
+
+
+#define wxUSE_POSTSCRIPT  0
+
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+
+#define wxUSE_ODBC          0
+
+#define wxODBC_FWD_ONLY_CURSORS	 1
+
+#define wxODBC_BACKWARD_COMPATABILITY 0
+
+
+#define REMOVE_UNUSED_ARG   1
+
+#define wxUSE_IOSTREAMH     1
+
+
+
+#define wxUSE_IMAGE         1
+
+#define wxUSE_LIBPNG        1
+
+#define wxUSE_LIBJPEG       1
+
+#define wxUSE_LIBTIFF       1
+
+#define wxUSE_GIF           1
+
+#define wxUSE_PNM           1
+
+#define wxUSE_PCX           1
+
+#define wxUSE_IFF           0
+
+#define wxUSE_XPM           1
+
+#define wxUSE_ICO_CUR       1
+
+#define wxUSE_PALETTE       1
+
+/* --- end common options --- */
+
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
@@ -214,14 +563,6 @@
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
-/*
- * use STL for containers and wxString
- */
-#define wxUSE_STL 0
-/*
- * Use regex support
- */
-#define wxUSE_REGEX 0
 /*
  * The built-in regex supports advanced REs in additional to POSIX's basic
  * and extended. Your system regex probably won't support this, and in this
@@ -232,22 +573,6 @@
  * Use XML support
  */
 #define wxUSE_XML 0
-/*
- * Use zlib
- */
-#define wxUSE_ZLIB 0
-/*
- * Use libpng
- */
-#define wxUSE_LIBPNG 0
-/*
- * Use libjpeg
- */
-#define wxUSE_LIBJPEG 0
-/*
- * Use libtiff
- */
-#define wxUSE_LIBTIFF 0
 /*
  * Use SDL for audio (Unix)
  */
@@ -259,17 +584,11 @@
 /*
  * Use iODBC
  */
-#define wxUSE_ODBC 0
 #define wxUSE_BUILTIN_IODBC 0
-#define wxODBC_FWD_ONLY_CURSORS 1
 /*
  * Use freetype
  */
 #define wxUSE_FREETYPE 0
-/*
- * Use Threads
- */
-#define wxUSE_THREADS 0
 /*
  * Have glibc2
  */
@@ -278,447 +597,6 @@
  * Use libXpm
  */
 #define wxHAVE_LIB_XPM 0
-/*
- * Use OpenGL
- */
-#define wxUSE_OPENGL 0
-#define wxUSE_GLCANVAS 0
-
-/*
- * Use GUI
- */
-#ifndef wxUSE_GUI
-#define wxUSE_GUI 0
-#endif
-/*
- * Don't use GUI (defined to 1 when compiling/using base only)
- */
-#define wxUSE_NOGUI 0
-
-/*
- * Catch fatal program exceptions
- */
-#define wxUSE_ON_FATAL_EXCEPTION 0
-
-/*
- * Use wxSingleInstanceChecker class
- */
-#define wxUSE_SNGLINST_CHECKER 0
-
-/*
- * Use constraints mechanism
- */
-#define wxUSE_CONSTRAINTS 0
-
-/*
- * Use validators
- */
-#define wxUSE_VALIDATORS 0
-
-/*
- * Use wxControl
- */
-#define wxUSE_CONTROLS 0
-
-/*
-   Use wxPopupWindow (useful in wxUniv only for now)
-*/
-#define wxUSE_POPUPWIN 0
-
-/*
-   Use wxTipWindow
- */
-#define wxUSE_TIPWINDOW 0
-
-/*
- * Use accelerators
- */
-#define wxUSE_ACCEL 0
-
-/*
- * Use wxCalendarCtrl
- */
-#define wxUSE_CALENDARCTRL 0
-
-/*
- * Use wxFileDialog
- */
-#define wxUSE_FILEDLG 0
-
-/*
- * Use wxFindReplaceDialog
- */
-#define wxUSE_FINDREPLDLG 0
-
-/*
- * Use wxFontDialog
- */
-#define wxUSE_FONTDLG 0
-
-/*
- * Use wxMimeTypesManager and related classes
- */
-#define wxUSE_MIMETYPE 0
-
-/*
- * Use wxSystemOptions
- */
-#define wxUSE_SYSTEM_OPTIONS 0
-
-/*
- * Use wxMessageDialog (and wxMessageBox)
- */
-#define wxUSE_MSGDLG 0
-
-/*
- * Use wxNumberEntryDialog
- */
-#define wxUSE_NUMBERDLG 0
-
-/*
- * Use wxTextEntryDialog
- */
-#define wxUSE_TEXTDLG 0
-
-/*
- * Use startup tips
- */
-#define wxUSE_STARTUP_TIPS 0
-
-/*
- * Use progress dialog
- */
-#define wxUSE_PROGRESSDLG 0
-
-/*
- * Use chooser dialog
- */
-#define wxUSE_CHOICEDLG 0
-
-/*
- * Use colour picker dialog
- */
-#define wxUSE_COLOURDLG 0
-
-/*
- * Use directory chooser dialog
- */
-#define wxUSE_DIRDLG 0
-
-/*
- * Use wxDragImage class
- */
-#define wxUSE_DRAGIMAGE 0
-
-/*
- * Enable accessibility support
- */
-#define wxUSE_ACCESSIBILITY 0
-
-/*
- * Use property sheet classes
- */
-#define wxUSE_PROPSHEET 0
-
-/*
- * Use wxWizard
- */
-#define wxUSE_WIZARDDLG 0
-
-/*
- * Use splash screen
- */
-#define wxUSE_SPLASH 0
-
-/*
- * Joystick support (Linux/GTK only)
- */
-#define wxUSE_JOYSTICK 0
-
-/*
- * Use this control
- */
-#define wxUSE_BUTTON 0
-/*
- * Use this control
- */
-#define wxUSE_CARET 0
-/*
- * Use this control
- */
-#define wxUSE_BMPBUTTON 0
-/*
- * Use this control
- */
-#define wxUSE_CHECKBOX 0
-/*
- * Use this control
- */
-#define wxUSE_CHECKLISTBOX 0
-/*
- * Use this control
- */
-#define wxUSE_COMBOBOX 0
-/*
- * Use this control
- */
-#define wxUSE_CHOICE 0
-/*
- * Use wxDisplay class
- */
-#define wxUSE_DISPLAY 0
-/*
- * Use this control
- */
-#define wxUSE_GAUGE 0
-/*
- * Use this control
- */
-#define wxUSE_GRID 0
-/*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
- */
-#define wxUSE_NEW_GRID 0
-/*
- * Use wxImageList class
- */
-#define wxUSE_IMAGLIST 0
-/*
- * Use this control
- */
-#define wxUSE_LISTBOX 0
-/*
- * Use this control
- */
-#define wxUSE_LISTCTRL 0
-/*
- * Use wxMenuBar, wxMenuItem and wxMenu
- */
-#define wxUSE_MENUS 0
-/*
- * Use this control
- */
-#define wxUSE_NOTEBOOK 0
-#define wxUSE_LISTBOOK 0
-#define wxUSE_CHOICEBOOK 0
-/*
- * Use this control
- */
-#define wxUSE_RADIOBOX 0
-/*
- * Use this control
- */
-#define wxUSE_RADIOBTN 0
-/*
- * Use this control
- */
-#define wxUSE_SASH 0
-/*
- * Use this control
- */
-#define wxUSE_SCROLLBAR 0
-/*
- * Use this control
- */
-#define wxUSE_SLIDER 0
-/*
- * Use this control
- */
-#define wxUSE_SPINBTN 0
-/*
- * Use this control
- */
-#define wxUSE_SPINCTRL 0
-/*
- * Use this control
- */
-#define wxUSE_SPLITTER 0
-/*
- * Use this control
- */
-#define wxUSE_STATBMP 0
-/*
- * Use this control
- */
-#define wxUSE_STATBOX 0
-/*
- * Use this control
- */
-#define wxUSE_STATLINE 0
-/*
- * Use this control
- */
-#define wxUSE_STATTEXT 0
-/*
- * Use this control
- */
-#define wxUSE_STATUSBAR 0
-/*
- * Use this control
- */
-#define wxUSE_TOGGLEBTN 0
-/*
- * Use Tab dialog class - obsolete, use wxNotebook instead
- */
-#define wxUSE_TAB_DIALOG 0
-/* compatibility */
-#define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
-
-/*
- * Use wxTextCtrl
- */
-#define wxUSE_TEXTCTRL 0
-
-/*
- * Use wxToollBar
- */
-#define wxUSE_TOOLBAR 0
-
-/*
- * If 1, use the native toolbar, otherwise use the generic version
- * (wxToolBarSimple) which may also be use together with the native one.
- */
-#define wxUSE_TOOLBAR_NATIVE 0
-
-/*
- * Use wxTreeLayout class
- */
-#define wxUSE_TREELAYOUT 0
-
-/*
- * Use this control
- */
-#define wxUSE_TREECTRL 0
-
-/*
- * Use wxLongLong (a.k.a. int64) class
- */
-#define wxUSE_LONGLONG 0
-
-/*
- * Use geometry classes
- */
-#define wxUSE_GEOMETRY 0
-
-/*
- * Use wxCmdLineParser class
- */
-#define wxUSE_CMDLINE_PARSER 0
-/*
- * Use wxDateTime
- */
-#define wxUSE_DATETIME 0
-/*
- * Use wxFile class
- */
-#define wxUSE_FILE 0
-/*
- * Use wxFFile class
- */
-#define wxUSE_FFILE 0
-/*
- * Use wxFSVolume class
- */
-#define wxUSE_FSVOLUME 1
-
-/*
- * Use wxTextBuffer class
- */
-#define wxUSE_TEXTBUFFER 0
-/*
- * Use wxTextFile class
- */
-#define wxUSE_TEXTFILE 0
-
-#define wxUSE_EXCEPTIONS 0
-
-/*
- * Use log classes and logging functions
- */
-#define wxUSE_LOG 0
-/*
- * Use log window
- */
-#define wxUSE_LOGWINDOW 0
-/*
- * Use standard GUI logger
- */
-#define wxUSE_LOGGUI 0
-/*
- * Use old log dialog instead of new wxLogGui
- */
-#define wxUSE_LOG_DIALOG 0
-/*
- * Use wxStopWatch
- */
-#define wxUSE_STOPWATCH 0
-/*
- * Use time and date classes
- */
-#define wxUSE_TIMEDATE 0
-/*
- * Use wave class
- */
-#define wxUSE_SOUND 0
-/*
- * Use wxMediaCtrl class
- */
-#define wxUSE_MEDIACTRL 0
-/*
- * Use DirectShow
- */
-#define wxUSE_DIRECTSHOW 0
-/*
- * Use config system
- */
-#define wxUSE_CONFIG 0
-/*
- * Use font mapping/conversion classes
- */
-#define wxUSE_FONTMAP 0
-/*
- * Use intl system
- */
-#define wxUSE_INTL 0
-/*
- * Use wxProtocol and related classes
- */
-#define wxUSE_PROTOCOL 0
-#define wxUSE_PROTOCOL_FILE 0
-#define wxUSE_PROTOCOL_FTP 0
-#define wxUSE_PROTOCOL_HTTP 0
-/*
- * Use streams
- */
-#define wxUSE_STREAMS 0
-/*
- * Use sockets
- */
-#define wxUSE_SOCKETS 0
-/*
- * Use dialup manager
- */
-#define wxUSE_DIALUP_MANAGER 0
-/*
- * Use standard C++ streams if 1. If 0, use wxWin
- * streams implementation.
- */
-#define wxUSE_STD_IOSTREAM  0
-/*
- * wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0
-/*
- * Use wxObjectLoader
- */
-#define wxUSE_DYNAMIC_LOADER 0
-
-/*
- * Use wxTimer
- */
-#define wxUSE_TIMER 0
-
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
@@ -730,24 +608,14 @@
 #define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
 
 /*
- * Use PostScript device context
+ * Use OpenGL
  */
-#define wxUSE_POSTSCRIPT 0
+#define wxUSE_OPENGL 0
 
 /*
- * Compile wxString with some Unicode (wide character) support?
+ * Don't use GUI (defined to 1 when compiling/using base only)
  */
-#define wxUSE_WCHAR_T 0
-
-/*
- * Compile wxWindows in Unicode mode?
- */
-#define wxUSE_UNICODE 0
-
-/*
- * Use MS Layer for Unicode on Win9X (Win32 only)?
- */
-#define wxUSE_UNICODE_MSLU 0
+#define wxUSE_NOGUI 0
 
 /*
  * Set to 1 to compile MS Windows XP theme engine support
@@ -760,21 +628,6 @@
  */
 #define wxUSE_UXTHEME_AUTO 1
 
-/*
- *  Set to 1 to use mousewheel events on Windows
- */
-#define wxUSE_MOUSEWHEEL 1
-
-/*
- * Hotkey support (Windows)
- */
-#define wxUSE_HOTKEY 1
-
-/*
- * Use wxURL class
- */
-#define wxUSE_URL 0
-
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -791,233 +644,33 @@
  */
 #define wxUSE_EXPERIMENTAL_PRINTF 0
 
-/*
- * Use Interprocess communication
- */
-#define wxUSE_IPC 0
 /*
  * Use wxGetResource & wxWriteResource (change .Xdefaults)
  */
 #define wxUSE_X_RESOURCES 0
-/*
- * Use clipboard
- */
-#define wxUSE_CLIPBOARD 0
-/*
- * Use wxDataObject
- */
-#define wxUSE_DATAOBJ 0
-/*
- * Use tooltips
- */
-#define wxUSE_TOOLTIPS 0
-/*
- * Use dnd
- */
-#define wxUSE_DRAG_AND_DROP 0
 /*
  * Use OLE (MSW only)
  */
 #define wxUSE_OLE 0
-/*
- * Use spline
- */
-#define wxUSE_SPLINES 0
-
-/*
- * Use MDI.
- */
-#define wxUSE_MDI 0
-/*
- * Use the mdi architecture
- */
-#define wxUSE_MDI_ARCHITECTURE 0
-/*
- * Use the document/view architecture
- */
-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
-/*
- * Use the print/preview architecture
- */
-#define wxUSE_PRINTING_ARCHITECTURE 0
-
-/*
- * Use Prolog IO
- */
-#define wxUSE_PROLOGIO 0
-/*
- * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
- */
-#define wxUSE_RESOURCES 0
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
-/*
- * Use wxWindows help facility
- */
-#define wxUSE_HELP 0
-/*
- * Use built-in HTML-based help controller
- */
-#define wxUSE_WXHTML_HELP 0
-/*
- * Use MS HTML Help controller (win32)
- */
-#define wxUSE_MS_HTML_HELP 0
 /*
  * Use MS HTML Help via libmspack (Unix)
  */
 #define wxUSE_LIBMSPACK 0
 
-/*
- * Use iostream.h rather than iostream
- */
-#define wxUSE_IOSTREAMH 0
-/*
- * Use Apple Ieee-double converter
- */
-#define wxUSE_APPLE_IEEE 0
-/*
- * Compatibility with 2.2 API
- */
-#define WXWIN_COMPATIBILITY_2_2 0
-/*
- * Compatibility with 2.4 API
- */
-#define WXWIN_COMPATIBILITY_2_4 0
-/*
- * Enables debugging: memory tracing, assert, etc., contains debug level
- */
-#define WXDEBUG 0
-/*
- * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
- * WARNING: this code may not work with all architectures, especially
- * if alignment is an issue.
- */
-#define wxUSE_MEMORY_TRACING 0
-/*
- * Enable debugging version of global memory operators new and delete
- * Disable it, If this causes problems (e.g. link errors)
- */
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-/*
- * VZ: What does this one do? (FIXME)
- */
-#define wxUSE_DEBUG_CONTEXT 0
-/*
- * In debug mode, causes new to be defined to
- * be WXDEBUG_NEW (see object.h). If this causes
- * problems (e.g. link errors), set this to 0.
- */
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 /*
  * Matthews garbage collection (used for MrEd?)
  */
 #define WXGARBAGE_COLLECTION_ON 0
-/*
- * Use splines
- */
-#define wxUSE_SPLINES 0
-/*
- * wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
- */
-#define wxUSE_DYNAMIC_CLASSES 1
-
-/*
- * Support for metafiles
- */
-#define wxUSE_METAFILE 0
-#define wxUSE_ENH_METAFILE 0
-
-/*
- * wxMiniFrame
- */
-#define wxUSE_MINIFRAME 0
-
-/*
- * wxHTML
- */
-#define wxUSE_HTML 0
-
-/*
- * wxXRC
- */
-#define wxUSE_XRC 0
 
 /*
  * wxWebKitCtrl
  */
 #define wxUSE_WEBKIT 0
 
-/*
- * (virtual) filesystems code
- */
-#define wxUSE_FILESYSTEM 0
-#define wxUSE_FS_INET 0
-#define wxUSE_FS_ZIP 0
-
-/*
- * A class that shows info window when app is busy
- * (works exactly like wxBusyCursor)
- */
-#define wxUSE_BUSYINFO 0
-
-/*
- * Zip stream for accessing files stored inside .zip archives
- */
-#define wxUSE_ZIPSTREAM 0
-
-/*
- * wxPalette class
- */
-#define wxUSE_PALETTE 0
-
-/*
- * wxImage support
- */
-#define wxUSE_IMAGE 0
-
-/*
- * GIF image format support
- */
-#define wxUSE_GIF 0
-
-/*
- * PCX image format support
- */
-#define wxUSE_PCX 0
-
-/*
- * IFF image format support
- */
-#define wxUSE_IFF 0
-
-/*
- * PNM image format support
- */
-#define wxUSE_PNM 0
-
-/*
- * XPM image format support
- */
-#define wxUSE_XPM 0
-
-/*
- * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
- */
-#define wxUSE_ICO_CUR 0
-
-/*
- * Set to 1 if for dynamically loadable plugins support
- */
-#define wxUSE_PLUGINS 0
-
-/*
- * Disable this if your compiler can't cope
- * with omission of prototype parameters.
- */
-#define REMOVE_UNUSED_ARG 1
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.