Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 64542d048ccbe683f1bf19bb248021ad3d3cdc15..c23defa8395674cf35c99f0ebab828fbecdc7567 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -34,22 +34,28 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/event.h"
+#endif
+
+#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"
 
-// Doesn't yet compile under BC++: no wininet.h
-#ifndef __BORLANDC__
+// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
 
 #include <ras.h>
 #include <raserror.h>
 
 #include <wininet.h>
 
-#include "wx/msw/private.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -1085,7 +1091,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
     {
         // create a hidden window to receive notification about connections
         // status change
-        extern wxChar wxPanelClassName[];
+        extern const wxChar *wxPanelClassName;
         ms_hwndRas = ::CreateWindow(wxPanelClassName, NULL,
                                     0, 0, 0, 0,
                                     0, NULL,