Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / msw / dialup.cpp

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index f33fcde10a926c01e8fd1ee1969b1a3648e8ad26..b812904744dbfb449b8f0492187f3bdcb535df9c 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -38,23 +38,31 @@
     #include "wx/event.h"
 #endif
 
     #include "wx/event.h"
 #endif
 

-#ifndef wxUSE_DYNLIB_CLASS
-#error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
+#include "wx/msw/private.h"  // must be before #include "dynlib.h"
+
+#if !wxUSE_DYNLIB_CLASS
+    #error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.

 #endif
 
 #include "wx/dynlib.h"
 
 #include "wx/dialup.h"
 
 #endif
 
 #include "wx/dynlib.h"
 
 #include "wx/dialup.h"
 

-// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
+// Doesn't yet compile under VC++ 4, BC++, mingw, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020))

 
 #include <ras.h>
 #include <raserror.h>
 
 #include <wininet.h>
 
 
 #include <ras.h>
 #include <raserror.h>
 
 #include <wininet.h>
 

-#include "wx/msw/private.h"
+// Not in VC++ 5
+#ifndef INTERNET_CONNECTION_LAN
+#define INTERNET_CONNECTION_LAN 2
+#endif
+#ifndef INTERNET_CONNECTION_PROXY
+#define INTERNET_CONNECTION_PROXY 4
+#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants