Removal of previous wxValidtor code for wxOS2

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 73add4e89086b423f3d2ea21e218af49cf2f1239..5c940c1476a8a15408fd7851b1ce86e54b849a13 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -228,16 +228,16 @@
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes

-#define wxUSE_HTML          0
+#define wxUSE_HTML          1

                                 // Set to 1 to use wxHTML sub-library
                                 // Set to 1 to use wxHTML sub-library

-#define wxUSE_FS_ZIP        0
-#define wxUSE_FS_INET       0   // Set to 1 to enable virtual file systems
+#define wxUSE_FS_ZIP        1
+#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems

 
 

-#define wxUSE_BUSYINFO      0
+#define wxUSE_BUSYINFO      1

                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor
                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor

-#define wxUSE_ZIPSTREAM     0
+#define wxUSE_ZIPSTREAM     1

                                 // input stream for reading from zip archives
 
 /*
                                 // input stream for reading from zip archives
 
 /*


@@ -332,9 +332,6 @@
 
 #define wxUSE_NATIVE_STATUSBAR        1
                                 // Set to 0 to use cross-platform wxStatusBar
 
 #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.

 
 /*
  * Any platform
 
 /*
  * Any platform


@@ -382,9 +379,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


@@ -394,23 +388,18 @@
 #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
 

-#if defined(__WXMSW__) && defined(__BORLANDC__)
-#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
 // 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__)
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)


@@ -452,13 +441,5 @@
 
 #endif
 
 
 #endif
 

-// Problem with VC++ 5 and dobjcmn.cpp
-/*
-#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-*/
-

 #endif
     // _WX_SETUP_H_
 #endif
     // _WX_SETUP_H_