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 fad3b9aac2ca7823a73169f26c247a8131377cff..c23defa8395674cf35c99f0ebab828fbecdc7567 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -34,19 +34,28 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #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"
 
 #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__)
+

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

-#include "wx/msw/private.h"
-

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


@@ -1082,7 +1091,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
     {
         // create a hidden window to receive notification about connections
         // status change
     {
         // 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,
         ms_hwndRas = ::CreateWindow(wxPanelClassName, NULL,
                                     0, 0, 0, 0,
                                     0, NULL,


@@ -1273,4 +1282,6 @@ static void WINAPI wxRasDialFunc(UINT unMsg,
                 rasconnstate, dwError);
 }
 
                 rasconnstate, dwError);
 }
 

+#endif
+  // __BORLANDC__

 #endif // wxUSE_DIALUP_MANAGER
 #endif // wxUSE_DIALUP_MANAGER