Applied patch [ 597700 ] Fix proposal for wxJoystick under MSW

[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 cdd0a8f42aad6e52d9e5032fb821f78753187e98..2e06159d6c35755b09bd97c6d996b022529f6189 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -49,10 +49,10 @@
 // This setting determines the compatibility with 2.0 API: set it to 1 to
 // enable it
 //
 // This setting determines the compatibility with 2.0 API: set it to 1 to
 // enable it
 //

-// Default is 0.
+// Default is 1.

 //
 // Recommended setting: 0 (please update your code instead!)
 //
 // Recommended setting: 0 (please update your code instead!)

-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_2 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
 
 // 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


@@ -918,6 +918,9 @@
 // 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
 


@@ -1060,12 +1063,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