Chianti, Pinot noir, WINE..

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index df22ac28c31010f4ba2f1e487a340f1af70bea36..2d2b52a2dc58a95558b34202e7afc031268e87b3 100644 (file)
--- 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
@@ -161,9 +163,22 @@
                                   // Use JPEG bitmap code
 #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
@@ -180,6 +195,9 @@
  *
  */
 
+#define wxUSE_OLE           1
+                                // drag-and-drop, clipboard, OLE Automation
+
 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
@@ -234,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.
@@ -282,6 +300,11 @@
 
 #endif
 
+#if defined(__WXMSW__) && defined(__BORLANDC__)
+#undef wxUSE_ODBC
+#define wxUSE_ODBC 0
+#endif
+
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS