diff -r -u include/wx/msw/setup.h include/wx/msw/setup.h
--- include/wx/msw/setup.h 2006-12-11 22:50:35.000000000 +0100
+++ include/wx/msw/setup.h 2007-02-25 19:39:56.000000000 +0100
@@ -43,7 +43,7 @@
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 1
+#define WXWIN_COMPATIBILITY_2_6 0
// 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
@@ -157,7 +157,7 @@
//
// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#ifndef wxUSE_UNICODE
- #define wxUSE_UNICODE 0
+ #define wxUSE_UNICODE 0
#endif
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
@@ -335,7 +335,7 @@
// Default is 1
//
// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME 1
+#define wxUSE_FSVOLUME 0
// Use wxStandardPaths class which allows to retrieve some standard locations
// in the file system
@@ -444,7 +444,7 @@
#define wxUSE_FS_ARCHIVE 1
// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET 1
+#define wxUSE_FS_INET 0
// wxArchive classes for accessing archives such as zip and tar
#define wxUSE_ARCHIVE_STREAMS 1
@@ -487,8 +487,8 @@
// The settings for the individual URL schemes
#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0
// Define this to use wxURL class.
#define wxUSE_URL 1
@@ -990,7 +990,7 @@
// Default is 0.
//
// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
-#define wxUSE_GLCANVAS 0
+#define wxUSE_GLCANVAS 1
// wxRichTextCtrl allows editing of styled text.
//
@@ -1051,7 +1051,7 @@
#define wxUSE_DRAGIMAGE 1
-#define wxUSE_IPC 1
+#define wxUSE_IPC 1
// 0 for no interprocess comms
#define wxUSE_HELP 1
// 0 for no help facility
@@ -1172,7 +1172,7 @@
#define wxUSE_PCX 1
// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF 0
+#define wxUSE_IFF 1
// Set to 1 for XPM format support
#define wxUSE_XPM 1
@@ -1220,7 +1220,7 @@
//
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
#ifndef wxUSE_UNICODE_MSLU
- #define wxUSE_UNICODE_MSLU 0
+ #define wxUSE_UNICODE_MSLU 0
#endif
// Set this to 1 if you want to use wxWidgets and MFC in the same program. This