X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fff5f0811df871262c511b360f12d6808c107db..c455ab932f89cc166fc38d3f2c2f942f6a130649:/include/wx/msw/setup0.h?ds=sidebyside

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4e12fe21ae..2d2b52a2dc 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -71,6 +71,8 @@
 
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
+#define wxUSE_CARET       1
+                                    // Define 1 to use wxCaret class
 #define wxUSE_XPM_IN_MSW  1
                                     // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1
@@ -132,12 +134,19 @@
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
-#define wxUSE_IOSTREAMH     0
+#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>
 
+#define wxUSE_STREAMS       1
+                                  // 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_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)
@@ -152,13 +161,24 @@
                                   // Use PNG bitmap code
 #define wxUSE_LIBJPEG       0
                                   // Use JPEG bitmap code
-#define wxUSE_STD_IOSTREAM  1
-                                  // Use standard C++ streams if 1. If 0, use wxWin
-                                  // streams implementation.
-
+#define wxUSE_SERIAL        0
+                                  // 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 to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
+#define wxUSE_SOCKETS       0
+                                  // Set to 1 to use socket classes
+
+// these settings can't be set to 0 for now
+#define wxUSE_INTL 1
+#define wxUSE_LOG 1
+#define wxUSE_VALIDATORS 1
+#define wxUSE_ACCEL 1
+#define wxUSE_SASH 1
+#define wxUSE_TEXTDLG 1
 
 /*
  * Finer detail
@@ -175,6 +195,9 @@
  *
  */
 
+#define wxUSE_OLE           1
+                                // drag-and-drop, clipboard, OLE Automation
+
 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
@@ -229,7 +252,7 @@
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
-#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__) || defined(__BORLANDC__)
+#if (!defined(WIN32) && !defined(__WIN32__)) || defined(__GNUWIN32__)
 // 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.
@@ -277,11 +300,19 @@
 
 #endif
 
+#if defined(__WXMSW__) && defined(__BORLANDC__)
+#undef wxUSE_ODBC
+#define wxUSE_ODBC 0
+#endif
+
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+
 #endif
 
 #endif