wxWindow::Show() works again

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 83a7a95159ddda56482f9fa8b70830bd6231d5cf..04503152e2ce42ccadcf6ecc9ff7d7e7b9b9c238 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -132,12 +132,19 @@
 #ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
 #else
 #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>
 
 #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)
 #define wxUSE_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)


@@ -150,13 +157,18 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code

-#define wxUSE_STD_IOSTREAM  1
-                                  // Use standard C++ streams if 1. If 0, use wxWin
-                                  // streams implementation.
-
+#define wxUSE_LIBJPEG       0
+                                  // 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_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method

+#define wxUSE_SOCKETS       0
+                                  // Set to 1 to use socket classes

 
 /*
  * Finer detail
 
 /*
  * Finer detail


@@ -173,6 +185,9 @@
  *
  */
 
  *
  */
 

+#define wxUSE_OLE           1
+                                // drag-and-drop, clipboard, OLE Automation
+

 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else


@@ -227,7 +242,7 @@
                                     // complains about deallocating
                                     // arrays of wxPoints if wxPoint is a class.
 
                                     // 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.
 // 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.


@@ -275,11 +290,19 @@
 
 #endif
 
 
 #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
 
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 

+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+

 #endif
 
 #endif
 #endif
 
 #endif