Added a constructor that allows creation of independent wxControl

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 95fdd2f356086888dbbd46035e29a36b8b892180..52fc43a9ec337aecb362b1bfee9186ddba3ef6a5 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -12,13 +12,16 @@
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 
 #ifndef _WX_SETUP_H_
 #define _WX_SETUP_H_
 

-/*
- * General features
- *
- */
+// ----------------------------------------------------------------------------
+// global settings
+// ----------------------------------------------------------------------------

 
 

-#define wxUSE_CONFIG           1
-                                // Use wxConfig, with CreateConfig in wxApp
+// define this to 0 when building wxBase library
+#define wxUSE_GUI            1
+
+// ----------------------------------------------------------------------------
+// compatibility settings
+// ----------------------------------------------------------------------------

 
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
 
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.


@@ -27,8 +30,79 @@
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 

+// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
+// but this is very dangerous because you can mistakenly pass an icon instead
+// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
+// because an icon is not a valid bitmap
+//
+// Starting from 2.1.12, you have the choice under this backwards compatible
+// behaviour (your code will still compile, but probably won't behave as
+// expected!) and not deriving wxIcon class from wxBitmap, but providing a
+// conversion ctor wxBitmap(const wxIcon&) instead.
+//
+// Recommended setting: 0
+#define wxICON_IS_BITMAP    0
+
+// ----------------------------------------------------------------------------
+// General features
+// ----------------------------------------------------------------------------
+
+// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
+// which allow the application to store its settings in the persistent
+// storage. Setting this to 1 will also enable on-demand creation of the
+// global config object in wxApp.
+//
+// See also wxUSE_CONFIG_NATIVE below.
+//
+// Recommended setting: 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
+// Win32) or the portable text file format used by the config classes under
+// Unix.
+//
+// Default is 1 to use native classes. Note that you may still use
+// wxFileConfig even if you set this to 1 - just the config object created by
+// default for the applications needs will be a wxRegConfig or wxIniConfig and
+// not wxFileConfig.
+//
+// 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
+// network connection is established/terminated.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_DIALUP_MANAGER   1
+
+// ----------------------------------------------------------------------------
+// Optional controls
+// ----------------------------------------------------------------------------
+
+// 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. Additionally, the generic toolbar class which
+// supports some features which might not be supported by the native wxToolBar
+// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+//
+// Default is 1 for all settings.
+//
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for
+// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility).
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
+#define wxUSE_TOOLBAR_SIMPLE 1
+
+// ----------------------------------------------------------------------------
+// Postscript support settings
+// ----------------------------------------------------------------------------
+

 #define wxUSE_POSTSCRIPT  0
 #define wxUSE_POSTSCRIPT  0

-                            // 0 for no PostScript device context
+                                // 0 for no PostScript device context

 #define wxUSE_AFM_FOR_POSTSCRIPT 0
                                 // 1 to use font metric files in GetTextExtent
 #define wxUSE_METAFILE    1
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
                                 // 1 to use font metric files in GetTextExtent
 #define wxUSE_METAFILE    1


@@ -50,120 +124,188 @@
                                 // 0 for no clipboard functions
 
 #define wxUSE_SPLINES     1
                                 // 0 for no clipboard functions
 
 #define wxUSE_SPLINES     1

-                                    // 0 for no splines
+                                // 0 for no splines

 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
 
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 

-#define wxUSE_TOOLBAR       1
-                                    // Define 1 to use toolbar classes
-#define wxUSE_BUTTONBAR     1
-                                    // Define 1 to use buttonbar classes (enhanced toolbar
-                                    // for MS Windows)
-#define wxUSE_GAUGE         1
-                                    // Define 1 to use Microsoft's gauge (Windows)
-                                    // or Bull's gauge (Motif) library (both in contrib).
-#define wxUSE_COMBOBOX      1
-                                    // Define 1 to use COMBOXBOX control (Windows)
-                                    // or FWW's ComboBox widget (Motif).
-#define wxUSE_RADIOBUTTON   1
-                                    // Define 1 to use radio button control
-
-#define wxUSE_SCROLLBAR   1
-                                    // Define 1 to compile contributed wxScrollBar class
-#define wxUSE_XPM_IN_MSW  1
-                                    // Define 1 to support the XPM package in wxBitmap.
+#define wxUSE_BUTTONBAR    1
+                                // Define 1 to use buttonbar classes (enhanced toolbar
+                                // for MS Windows)
+#define wxUSE_GAUGE        1
+                                // Define 1 to use Microsoft's gauge (Windows)
+                                // or Bull's gauge (Motif) library (both in contrib).
+#define wxUSE_COMBOBOX     1
+                                // Define 1 to use COMBOXBOX control (Windows)
+                                // or FWW's ComboBox widget (Motif).
+#define wxUSE_CHOICE       1
+                                // Define 1 to use CHOICE
+
+#define wxUSE_RADIOBUTTON  1
+                                // Define 1 to use radio button control
+#define wxUSE_RADIOBTN     1
+                                // Unfortunately someone introduced this one, too
+#define wxUSE_RADIOBOX     1
+                                // And this... don't know which one is corect
+
+#define wxUSE_SCROLLBAR    1
+                                // Define 1 to compile contributed wxScrollBar class
+
+#define wxUSE_CHECKBOX     1
+                                // Define 1 to compile checkbox
+
+#define wxUSE_LISTBOX      1
+                                // Define 1 to compile listbox
+
+#define wxUSE_SPINBTN      1
+                                // Define 1 to compile spin button
+
+#define wxUSE_SPINCTRL     1
+                                // Define 1 to use wxSpinCtrl class
+
+#define wxUSE_STATLINE     1
+                                // use wxStaticLine class
+
+#define wxUSE_CHECKLISTBOX 1
+                                // Define 1 to compile check listbox
+
+#define wxUSE_CHOICE       1
+                                // Define 1 to compile choice
+
+#define wxUSE_CARET        1
+                                // Define 1 to use wxCaret class
+
+#define wxUSE_SLIDER       1
+                                // Define 1 to use wxSlider class
+
+#define wxUSE_NEW_GRID     1
+                                // Define 1 to use the new wxGrid class
+                                // (still under development, define 0 to
+                                //  use existing wxGrid class)
+#define wxUSE_XPM_IN_MSW   1
+                                // Define 1 to support the XPM package in wxBitmap.

 #define wxUSE_IMAGE_LOADING_IN_MSW        1
 #define wxUSE_IMAGE_LOADING_IN_MSW        1

-                                  // Use dynamic DIB loading/saving code in utils/dib under MSW.
+                                // Use dynamic DIB loading/saving code in utils/dib under MSW.

 #define wxUSE_RESOURCE_LOADING_IN_MSW     1
 #define wxUSE_RESOURCE_LOADING_IN_MSW     1

-                                  // Use dynamic icon/cursor loading/saving code
-                                  // under MSW.
+                                // Use dynamic icon/cursor loading/saving code
+                                // under MSW.

 #define wxUSE_WX_RESOURCES        1
 #define wxUSE_WX_RESOURCES        1

-                                  // Use .wxr resource mechanism (requires PrologIO library)
+                                // Use .wxr resource mechanism (requires PrologIO library)

 
 

-// BC++/Win16 can't cope with the amount of data in resource.cpp
-#if defined(__WIN16__) && defined(__BORLANDC__)
-#undef wxUSE_WX_RESOURCES
-#define wxUSE_WX_RESOURCES        0
-#endif
+#define wxUSE_STARTUP_TIPS        1
+                                // support for startup tips (wxShowTip &c)

 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1

-                                  // Set to 0 to disable document/view architecture
+                                // Set to 0 to disable document/view architecture
+#define wxUSE_MDI_ARCHITECTURE    1
+                                // Set to 0 to disable MDI document/view architecture

 #define wxUSE_PRINTING_ARCHITECTURE  1
 #define wxUSE_PRINTING_ARCHITECTURE  1

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

 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1

-                                    // Set to 0 to disable PostScript print/preview architecture code
-                                    // under Windows (just use Windows printing).
+                                // Set to 0 to disable PostScript print/preview architecture code
+                                // under Windows (just use Windows printing).

 #define wxUSE_DYNAMIC_CLASSES     1
 #define wxUSE_DYNAMIC_CLASSES     1

-                                  // If 1, enables provision of run-time type information.
-                                  // NOW MANDATORY: don't change.
+                                // If 1, enables provision of run-time type information.
+                                // NOW MANDATORY: don't change.

 #define wxUSE_MEMORY_TRACING      1
 #define wxUSE_MEMORY_TRACING      1

-                                  // If 1, enables debugging versions of wxObject::new and
-                                  // wxObject::delete *IF* __WXDEBUG__ is also defined.
-                                  // WARNING: this code may not work with all architectures, especially
-                                  // if alignment is an issue.
+                                // If 1, enables debugging versions of wxObject::new and
+                                // wxObject::delete *IF* __WXDEBUG__ is also defined.
+                                // WARNING: this code may not work with all architectures, especially
+                                // if alignment is an issue.

 #define wxUSE_DEBUG_CONTEXT       1
 #define wxUSE_DEBUG_CONTEXT       1

-                                  // If 1, enables wxDebugContext, for
-                                  // writing error messages to file, etc. 
-                                  // If __WXDEBUG__ is not defined, will still use
-                                  // normal memory operators.
-                                  // It's recommended to set this to 1,
-                                  // since you may well need to output
-                                  // an error log in a production
-                                  // version (or non-debugging beta)
+                                // If 1, enables wxDebugContext, for
+                                // writing error messages to file, etc.
+                                // If __WXDEBUG__ is not defined, will still use
+                                // normal memory operators.
+                                // It's recommended to set this to 1,
+                                // since you may well need to output
+                                // an error log in a production
+                                // version (or non-debugging beta)

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1

-                                  // In debug mode, cause new and delete to be redefined globally.
-                                  // If this causes problems (e.g. link errors), set this to 0.
+                                // In debug mode, cause new and delete to be redefined globally.
+                                // If this causes problems (e.g. link errors), set this to 0.

 
 #define wxUSE_DEBUG_NEW_ALWAYS 1
 
 #define wxUSE_DEBUG_NEW_ALWAYS 1

-                                  // 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.
-                                  // You may need to set this to 0 if using templates (at least
-                                  // for VC++).
-
-#define REMOVE_UNUSED_ARG 1
-                                  // Set this to 0 if your compiler can't cope
-                                  // with omission of prototype parameters.
-
-#define wxUSE_ODBC                   1
-                                    // Define 1 to use ODBC classes
+                                // 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.
+                                // You may need to set this to 0 if using templates (at least
+                                // for VC++).
+
+#define REMOVE_UNUSED_ARG   1
+                                // Set this to 0 if your compiler can't cope
+                                // with omission of prototype parameters.
+
+#define wxUSE_ODBC          0
+                                // Define 1 to use ODBC classes
+
+#define wxODBC_FWD_ONLY_CURSORS 1
+                                // Some databases/ODBC drivers only allow forward scrolling cursors.
+                                // Unless you specifically want to use backward scrolling
+                                // cursors, and you know that all of the databases/ODBC drivers
+                                // that you will use these odbc classes with allow backward
+                                // scrolling cursors, this setting should remain set to 1
+                                // for maximum database/driver compatibilty

 
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
 #define wxUSE_IOSTREAMH     1
 #endif
 
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
 #define wxUSE_IOSTREAMH     1
 #endif

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

 
 #define wxUSE_STREAMS       1
 
 #define wxUSE_STREAMS       1

-                                  // If enabled (1), compiles wxWindows streams classes
+                                // If enabled (1), compiles wxWindows streams classes

 
 

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

 
 #define wxUSE_WXCONFIG      1
 
 #define wxUSE_WXCONFIG      1

-                                  // if enabled, compiles built-in OS independent wxConfig
-                                  // class and it's file (any platform) and registry (Win)
-                                  // based implementations
+                                // if enabled, compiles built-in OS independent wxConfig
+                                // class and it's file (any platform) and registry (Win)
+                                // based implementations

 #define wxUSE_THREADS       1
 #define wxUSE_THREADS       1

-                                  // support for multithreaded applications: if
-                                  // 1, compile in thread classes (thread.h)
-                                  // and make the library thread safe
+                                // support for multithreaded applications: if
+                                // 1, compile in thread classes (thread.h)
+                                // and make the library thread safe

 #define wxUSE_ZLIB          1
 #define wxUSE_ZLIB          1

-                                  // Use zlib for compression in streams and PNG code
+                                // Use zlib for compression in streams and PNG code

 #define wxUSE_LIBPNG        1
 #define wxUSE_LIBPNG        1

-                                  // Use PNG bitmap code
-#define wxUSE_LIBJPEG       0
-                                  // Use JPEG bitmap code
+                                // Use PNG bitmap/image code
+#define wxUSE_LIBJPEG       1
+                                // Use JPEG bitmap/image code
+#define wxUSE_LIBTIFF       0
+                                // Use TIFF bitmap/image code
+#define wxUSE_GIF           1
+                                // Use GIF bitmap/image code
+#define wxUSE_PNM           1
+                                // Use PNM bitmap/image code
+#define wxUSE_PCX           1
+                                // Use PCX bitmap/image code

 #define wxUSE_SERIAL        0
 #define wxUSE_SERIAL        0

-                                  // Use serialization (requires utils/serialize)
+                                // Use serialization (requires utils/serialize)
+#define wxUSE_DYNLIB_CLASS  0
+                                // Compile in wxLibrary class for run-time
+                                // DLL loading and function calling

 #define wxUSE_TOOLTIPS      1
 #define wxUSE_TOOLTIPS      1

-                                  // Define to use wxToolTip class and
-                                  // wxWindow::SetToolTip() method
+                                // Define to use wxToolTip class and
+                                // wxWindow::SetToolTip() method
+#define wxUSE_SOCKETS       1
+                                // Set to 1 to use socket classes
+#define wxUSE_HTML          1
+                                // Set to 1 to use wxHTML sub-library
+#define wxUSE_FS_ZIP        1
+#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems
+
+#define wxUSE_BUSYINFO      1
+                                // wxBusyInfo displays window with message
+                                // when app is busy. Works in same way as
+                                // wxBusyCursor
+#define wxUSE_ZIPSTREAM     1
+                                // input stream for reading from zip archives

 
 /*
  * Finer detail
 
 /*
  * Finer detail


@@ -175,52 +317,92 @@
                                 // will be used to write, in a portable way,
                                 // float on the disk
 
                                 // will be used to write, in a portable way,
                                 // float on the disk
 

+// use wxFile class - required by i18n code, wxConfig and others - recommended
+#define wxUSE_FILE                1
+
+// use wxTextFile class: requires wxFile, required by wxConfig
+#define wxUSE_TEXTFILE            1
+
+// i18n support: _() macro, wxLocale class. Requires wxFile
+#define wxUSE_INTL                1
+
+// wxLogXXX functions - highly recommended
+#define wxUSE_LOG                 1
+
+// wxValidator class
+#define wxUSE_VALIDATORS 1
+
+// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
+#define wxUSE_ACCEL 1
+
+// wxSashWindow class
+#define wxUSE_SASH 1
+
+// text entry dialog and wxGetTextFromUser function
+#define wxUSE_TEXTDLG 1
+
+// wxStatusBar class
+#define wxUSE_STATUSBAR 1
+
+// progress dialog class for lengthy operations
+#define wxUSE_PROGRESSDLG 1
+
+// wxDirDlg class for getting a directory name from user
+#define wxUSE_DIRDLG 1
+

 /*
  * MS Windows/Windows NT
  *
  */
 
 /*
  * MS Windows/Windows NT
  *
  */
 

+#define wxUSE_OLE           1
+                                // drag-and-drop, clipboard, OLE Automation
+

 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
 #define wxUSE_CTL3D                      1
 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
 #define wxUSE_CTL3D                      1

-                                    // Define 1 to use Microsoft CTL3D library.
-                                    // See note above about using FAFA and CTL3D.
+                                // Define 1 to use Microsoft CTL3D library.
+                                // See note above about using FAFA and CTL3D.
+#endif
+
+// can we use RICHEDIT control?
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0

 #endif
 
 #define wxUSE_COMMON_DIALOGS         1
 #endif
 
 #define wxUSE_COMMON_DIALOGS         1

-                                    // On rare occasions (e.g. using DJGPP) may want
-                                    // to omit common dialogs
-                                    // (e.g. file selector, printer dialog).
-                                    // Switching this off also switches off
-                                    // the printing architecture and interactive
-                                    // wxPrinterDC.
+                                // On rare occasions (e.g. using DJGPP) may want
+                                // to omit common dialogs
+                                // (e.g. file selector, printer dialog).
+                                // Switching this off also switches off
+                                // the printing architecture and interactive
+                                // wxPrinterDC.

 #define wxUSE_ITSY_BITSY             1
 #define wxUSE_ITSY_BITSY             1

-                                    // Define 1 to use Microsoft's ItsyBitsy
-                                    // small title bar library, for wxMiniFrame
+                                // Define 1 to use Microsoft's ItsyBitsy
+                                // small title bar library, for wxMiniFrame

 #define wxUSE_BITMAP_MESSAGE         1
 #define wxUSE_BITMAP_MESSAGE         1

-                                    // Define 1 to use bitmap messages.
+                                // Define 1 to use bitmap messages.

 #define wxUSE_PORTABLE_FONTS_IN_MSW  0
 #define wxUSE_PORTABLE_FONTS_IN_MSW  0

-                                    // Define 1 to use new portable font scheme in Windows
-                                    // (used by default under X)
+                                // Define 1 to use new portable font scheme in Windows
+                                // (used by default under X)

 #define wxFONT_SIZE_COMPATIBILITY    0
 #define wxFONT_SIZE_COMPATIBILITY    0

-                                    // Define 1 for font size to be backward compatible
-                                    // to 1.63 and earlier. 1.64 and later define point
-                                    // sizes to be compatible with Windows.
+                                // Define 1 for font size to be backward compatible
+                                // to 1.63 and earlier. 1.64 and later define point
+                                // sizes to be compatible with Windows.

 #define wxUSE_GENERIC_DIALOGS_IN_MSW 1
 #define wxUSE_GENERIC_DIALOGS_IN_MSW 1

-                                    // Define 1 to use generic dialogs in Windows, even though
-                                    // they duplicate native common dialog (e.g. wxColourDialog)
+                                // Define 1 to use generic dialogs in Windows, even though
+                                // they duplicate native common dialog (e.g. wxColourDialog)

 #define wxUSE_PENWINDOWS 0
 #define wxUSE_PENWINDOWS 0

-                                    // Set to 1 to use PenWindows
+                                // Set to 1 to use PenWindows

 
 #define wxUSE_OWNER_DRAWN             1
 
 #define wxUSE_OWNER_DRAWN             1

-                                    // Owner-drawn menus and listboxes
+                                // Owner-drawn menus and listboxes

 
 #define wxUSE_NATIVE_STATUSBAR        1
 
 #define wxUSE_NATIVE_STATUSBAR        1

-                                    // Set to 0 to use cross-platform wxStatusBar
-#define wxUSE_DBWIN32                 1
-                                    // Use Andrew Tucker's OutputDebugString implementation
-                                    // (required on Win95 only). See utils.cpp.
+                                // Set to 0 to use cross-platform wxStatusBar

 
 /*
  * Any platform
 
 /*
  * Any platform


@@ -228,13 +410,19 @@
  */
 
 #define wxUSE_TYPEDEFS               0
  */
 
 #define wxUSE_TYPEDEFS               0

-                                    // Use typedefs not classes for wxPoint
-                                    // and others, to reduce overhead and avoid
-                                    // MS C7 memory bug. Bounds checker
-                                    // complains about deallocating
-                                    // arrays of wxPoints if wxPoint is a class.
+                                // Use typedefs not classes for wxPoint
+                                // and others, to reduce overhead and avoid
+                                // MS C7 memory bug. Bounds checker
+                                // complains about deallocating
+                                // arrays of wxPoints if wxPoint is a class.
+
+#if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#ifndef wxUSE_NORLANDER_HEADERS
+#   define wxUSE_NORLANDER_HEADERS 1
+#endif
+#endif

 
 

-#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__) || defined(__BORLANDC__)
+#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS))

 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
 // GnuWin32 doesn't have appropriate headers for e.g. IUnknown.
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
 // GnuWin32 doesn't have appropriate headers for e.g. IUnknown.


@@ -262,9 +450,6 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-

 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 #endif
 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 #endif


@@ -274,19 +459,57 @@
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

-#undef wxUSE_DBWIN32
-#define wxUSE_DBWIN32 0
-

 #undef wxUSE_ODBC
 #define wxUSE_ODBC 0
 
 #endif
 
 #undef wxUSE_ODBC
 #define wxUSE_ODBC 0
 
 #endif
 

+// BC++/Win16 can't cope with the amount of data in resource.cpp
+#if defined(__WIN16__) && defined(__BORLANDC__)
+#undef wxUSE_WX_RESOURCES
+#define wxUSE_WX_RESOURCES        0
+
+#undef wxUSE_ODBC
+#define wxUSE_ODBC                0
+#endif
+
+#if defined(__WXMSW__) && defined(__WATCOMC__)
+#undef wxUSE_LIBJPEG
+#define wxUSE_LIBJPEG 0
+#endif
+

 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #if defined(__WXMSW__) && !defined(__WIN32__)
 

+#undef wxUSE_SOCKETS
+#define wxUSE_SOCKETS 0
+

 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+
+#undef wxUSE_SPINCTRL
+#define wxUSE_SPINCTRL 0
+
+#undef wxUSE_SPINBTN
+#define wxUSE_SPINBTN 0
+
+#undef wxUSE_LIBPNG
+#define wxUSE_LIBPNG 0
+
+#undef wxUSE_LIBJPEG
+#define wxUSE_LIBJPEG 0
+
+#undef wxUSE_GIF
+#define wxUSE_GIF 0
+
+#undef wxUSE_PNM
+#define wxUSE_PNM 0
+
+#undef wxUSE_PCX
+#define wxUSE_PCX 0
+

 #endif
 
 #endif
 #endif
 
 #endif