it didn't compile at all...

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a9e132d600afe2d334961fe6afdf13ea730190f1..d76043d8723cbedd2848043ad537f2b30f876832 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -32,7 +32,8 @@
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
-
+#define wxUSE_DIALUP_MANAGER   1
+                                // Use wxDialUpManager class
 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
@@ -401,15 +402,20 @@
 
 #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
+
+#undef wxUSE_ODBC
+#define wxUSE_ODBC                0
+#endif
+
+// With C++Builder we get lots of doubly-defined symbols
+// when including both winsock.h and winsock2.h
+#if defined(__BORLANDC__) && (__BORLANDC__ == 0x530)
+#undef wxUSE_SOCKETS
+#undef wxUSE_SOCKETS 0
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)