implemented GetLabel() (part of patch 1679337)

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

diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index 3a80e8aef4bfc5de36d01dd7542e0152fe7ab51d..1919e8d729f0ac30ca305b4e3f81e1c1f65883a4 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SETUP_H_


@@ -28,52 +28,15 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 1.68 API:
-// Level 0: no backward compatibility, all new features
-// Level 1: some extra methods are defined for compatibility.
+// This setting determines the compatibility with 2.6 API: set it to 0 to
+// flag all cases of using deprecated functions.

 //
 //

-// Default is 0.
-//
-// Recommended setting: 0 (in fact the compatibility code is now very minimal
-// so there is little advantage to setting it to 1.
-#define WXWIN_COMPATIBILITY  0
-
-// This setting determines the compatibility with 2.0 API: set it to 1 to
-// enable it
-//
-// Default is 0.
-//
-// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2 0
-
-// This setting determines the compatibility with 2.0 API: set it to 1 to
-// enable it
-//
-// Default is 0.
+// Default is 1 but please try building your code with 0 as the default will
+// change to 0 in the next version and the deprecated functions will disappear
+// in the version after it completely.

 //
 //

-// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_2 0
-
-// 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
-
-// Define as 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.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
+// Recommended setting: 0 (please update your code)
+#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.
 
 // 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.


@@ -90,7 +53,7 @@
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features

-// as wxWindows memory debugging subsystem built in since version 5.0 and you
+// as wxWidgets memory debugging subsystem built in since version 5.0 and you

 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //


@@ -117,7 +80,7 @@
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section

-#define wxUSE_MEMORY_TRACING 1
+#define wxUSE_MEMORY_TRACING 0

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


@@ -159,7 +122,7 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
 // Unicode support
 // ----------------------------------------------------------------------------
 

-// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be

 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //
 // defined as wchar_t, wxString will use Unicode internally. If you set this
 // to 1, you must use wxT() macro for all literal strings in the program.
 //


@@ -172,6 +135,18 @@
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000)
 #define wxUSE_UNICODE 0
 
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000)
 #define wxUSE_UNICODE 0
 

+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
+// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
+// setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
+// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
+// will have to modify the makefiles to include unicows.lib import library as the first
+// library.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#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


@@ -224,7 +199,7 @@
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 0
 
 // Recommended setting: 0 unless you do plan to develop MT applications
 #define wxUSE_THREADS 0
 

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

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


@@ -287,15 +262,6 @@
 // Recommended setting: 1
 #define wxUSE_DATETIME      1
 
 // Recommended setting: 1
 #define wxUSE_DATETIME      1
 

-// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not
-// the same as wxDateTime!). These classes are obsolete and shouldn't be used
-// in new code
-//
-// Default is 0
-//
-// Recommended setting: 0 unless you have legacy code which uses these classes
-#define wxUSE_TIMEDATE 0
-

 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1
 // Set wxUSE_TIMER to 1 to compile wxTimer class
 //
 // Default is 1


@@ -350,6 +316,8 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

+#define wxUSE_DYNAMIC_LOADER  0
+

 #define wxUSE_DYNLIB_CLASS  0
 
 // Set to 1 to use socket classes
 #define wxUSE_DYNLIB_CLASS  0
 
 // Set to 1 to use socket classes


@@ -373,7 +341,7 @@
 
 // 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

-// from wxWindows one.
+// from wxWidgets one.

 //
 // Default is 1.
 //
 //
 // Default is 1.
 //


@@ -402,8 +370,48 @@
 // contribute us a makefile for src/regex for it
 #define wxUSE_REGEX       0
 
 // contribute us a makefile for src/regex for it
 #define wxUSE_REGEX       0
 

-// wxWave class
-#define wxUSE_WAVE      0
+// wxSound class
+#define wxUSE_SOUND      0
+
+// Use wxMediaCtrl
+//
+// Default is 1.
+//
+// Recommended setting: 1 
+#define wxUSE_MEDIACTRL     1
+
+// Use QuickTime
+//
+// Default is 0
+//
+// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
+#define wxUSE_QUICKTIME     0
+
+// Use DirectShow
+//
+// Default is 0
+//
+// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
+#define wxUSE_DIRECTSHOW    1
+
+// Use wxWidget's XRC XML-based resource system.  Recommended.
+//
+// Default is 1
+//
+// Recommended setting: 1 (requires wxUSE_XML)
+#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.
+//
+// Default is 1
+//
+// Recommended setting: 1 (required by XRC)
+#if wxUSE_XRC
+#  define wxUSE_XML       1
+#else
+#  define wxUSE_XML       0
+#endif

 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls


@@ -424,7 +432,15 @@
 // Recommended setting: 0
 #define wxUSE_POPUPWIN     1
 
 // Recommended setting: 0
 #define wxUSE_POPUPWIN     1
 

-// Each of the settings below corresponds to one wxWindows control. They are
+// wxTipWindow allows to implement the custom tooltips, it is used by the
+// context help classes. Requires wxUSE_POPUPWIN.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 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
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // if you desperately want to save some space. If you use any of these you must


@@ -437,18 +453,18 @@
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
 #define wxUSE_CHECKBOX     1    // wxCheckBox
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
 #define wxUSE_CHECKBOX     1    // wxCheckBox

-#define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)

 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox
 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox

-#define wxUSE_GAUGE        0    // wxGauge
+#define wxUSE_GAUGE        1    // wxGauge

 #define wxUSE_LISTBOX      1    // wxListBox
 #define wxUSE_LISTCTRL     0    // wxListCtrl
 #define wxUSE_LISTBOX      1    // wxListBox
 #define wxUSE_LISTCTRL     0    // wxListCtrl

-#define wxUSE_RADIOBOX     0    // wxRadioBox
+#define wxUSE_RADIOBOX     1    // wxRadioBox

 #define wxUSE_RADIOBTN     1    // wxRadioButton
 #define wxUSE_SCROLLBAR    1    // wxScrollBar
 #define wxUSE_SLIDER       1    // wxSlider
 #define wxUSE_RADIOBTN     1    // wxRadioButton
 #define wxUSE_SCROLLBAR    1    // wxScrollBar
 #define wxUSE_SLIDER       1    // wxSlider

-#define wxUSE_SPINBTN      0    // wxSpinButton
-#define wxUSE_SPINCTRL     0    // wxSpinCtrl
+#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_STATBOX      1    // wxStaticBox
 #define wxUSE_STATLINE     1    // wxStaticLine
 #define wxUSE_STATTEXT     1    // wxStaticText


@@ -476,20 +492,13 @@
 
 // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
 // classes at all. Otherwise, use the native toolbar class unless
 
 // 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.
+// wxUSE_TOOLBAR_NATIVE is 0.

 //
 // Default is 1 for all settings.
 //
 //
 // 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).
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.

 #define wxUSE_TOOLBAR 0
 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR 0
 #define wxUSE_TOOLBAR_NATIVE 0

-#define wxUSE_TOOLBAR_SIMPLE 0
-
-// this setting is obsolete, value is ignored
-#define wxUSE_BUTTONBAR    0

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


@@ -499,7 +508,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_NOTEBOOK 0
+#define wxUSE_NOTEBOOK 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.


@@ -509,20 +518,10 @@
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 

-// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
-// the new, much imporved and enhanced version. The new version is backwards
-// compatible with the old one and should be used whenever possible, i.e. if
-// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too.
-//
-// Default is 1 for both options.
-//
-// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
-// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is
-// essential.
+// wxGrid class
+// Default is 1

 //
 //

-// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.

 #define wxUSE_GRID         0
 #define wxUSE_GRID         0

-#define wxUSE_NEW_GRID     0

 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor
 #define wxUSE_PROPSHEET    0
 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor
 #define wxUSE_PROPSHEET    0


@@ -552,7 +551,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.
 //


@@ -592,15 +591,6 @@
 // common dialogs
 // ----------------------------------------------------------------------------
 
 // common dialogs
 // ----------------------------------------------------------------------------
 

-// Define 1 to use generic dialogs in Windows, even though they duplicate
-// native common dialog (e.g. wxColourDialog). This is mainly useful for
-// testing.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
-

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


@@ -619,7 +609,7 @@
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
 // 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
 //


@@ -816,10 +806,6 @@
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 

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

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


@@ -837,7 +823,7 @@
 #define wxODBC_FWD_ONLY_CURSORS         1
 
 // Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
 #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 compatability with the
+// member variables.  With a setting of 1, full backward compatibility with the

 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.
 // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
 // as future development will be done only on the non-deprecated
 // functions/classes/member variables/etc.


@@ -896,9 +882,15 @@
 // Set to 1 for PCX format support
 #define wxUSE_PCX           0
 
 // Set to 1 for PCX format support
 #define wxUSE_PCX           0
 

+// Set to 1 for IFF format support
+#define wxUSE_IFF           0
+

 // Set to 1 for XPM format support
 #define wxUSE_XPM           1
 
 // Set to 1 for XPM format support
 #define wxUSE_XPM           1
 

+// Set to 1 for MS Icons and Cursors format support
+#define wxUSE_ICO_CUR       1
+

 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1
 
 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1
 


@@ -906,7 +898,7 @@
 // Windows-only settings
 // ----------------------------------------------------------------------------
 
 // Windows-only settings
 // ----------------------------------------------------------------------------
 

-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
+// 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.
 // will override some other settings (see below)
 //
 // Default is 0.


@@ -935,18 +927,9 @@
 #define wxUSE_CTL3D                      1
 #endif
 
 #define wxUSE_CTL3D                      1
 #endif
 

-// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
-// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
-// miniframes support instead.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_ITSY_BITSY             0
-#else
-#define wxUSE_ITSY_BITSY             1
-#endif
+// 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
 
 // 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


@@ -956,7 +939,7 @@
 //
 // Recommended setting: 1, only set it to 0 if your compiler doesn't have
 //                      or can't compile <richedit.h>
 //
 // Recommended setting: 1, only set it to 0 if your compiler doesn't have
 //                      or can't compile <richedit.h>

-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)

 #define wxUSE_RICHEDIT  1
 
 // TODO:  This should be ifdef'ed for any compilers that don't support
 #define wxUSE_RICHEDIT  1
 
 // TODO:  This should be ifdef'ed for any compilers that don't support


@@ -983,9 +966,6 @@
 // NB: all settings in this section are obsolete and should not be used/changed
 //     at all, they will disappear
 
 // NB: all settings in this section are obsolete and should not be used/changed
 //     at all, they will disappear
 

-// Set to 1 to use PenWindows
-#define wxUSE_PENWINDOWS             0
-

 // Define 1 to use bitmap messages.
 #define wxUSE_BITMAP_MESSAGE         1
 
 // Define 1 to use bitmap messages.
 #define wxUSE_BITMAP_MESSAGE         1
 


@@ -1035,12 +1015,6 @@
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 
 #define wxUSE_DEBUG_NEW_ALWAYS          0
 #endif // wxUSE_MFC
 

-// ODBC classes aren't Unicode-compatible yet
-#if wxUSE_UNICODE
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-#endif
-

 #if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs
 #if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
 // Can't use OLE drag and drop in Windows 3.1 because we don't know how
 // to implement UUIDs


@@ -1078,16 +1052,6 @@
 #define wxUSE_OWNER_DRAWN 0
 #endif // __SALFORDC__
 
 #define wxUSE_OWNER_DRAWN 0
 #endif // __SALFORDC__
 

-#ifdef __TWIN32__
-
-#undef wxUSE_THREADS
-#define wxUSE_THREADS 0
-
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-
-#endif // __TWIN32__
-

 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES