Smooth Aqua buttons in wxTreeCtrl.

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

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 5d94d8d8dfa9ca6bfa8885a5b1b69765f82804ed..ff5cdfa3db90f5acf14959aef35c2ecc6e362745 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -864,9 +864,17 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
 
     if ( dwRet != 0 )
     {
 
     if ( dwRet != 0 )
     {

+#if wxUSE_UNICODE
+        // can't pass a wxWCharBuffer through ( ... )
+        wxLogError(_("Failed to %s dialup connection: %s").data(),
+                   async ? _("initiate").data() : _("establish").data(),
+                   GetErrorString(dwRet).c_str());
+#else
+        // can't pass a wxWCharBuffer through ( ... )

         wxLogError(_("Failed to %s dialup connection: %s"),
                    wxString(async ? _("initiate") : _("establish")).c_str(),
                    GetErrorString(dwRet).c_str());
         wxLogError(_("Failed to %s dialup connection: %s"),
                    wxString(async ? _("initiate") : _("establish")).c_str(),
                    GetErrorString(dwRet).c_str());

+#endif

 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )
 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )


@@ -960,7 +968,7 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
     wxDllType hDll = wxDllLoader::LoadLibrary(_T("WININET"), &ok);
     if ( ok )
     {
     wxDllType hDll = wxDllLoader::LoadLibrary(_T("WININET"), &ok);
     if ( ok )
     {

-        typedef BOOL (*INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);
+        typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);

         INTERNETGETCONNECTEDSTATE pfnInternetGetConnectedState;
 
         #define RESOLVE_FUNCTION(type, name) \
         INTERNETGETCONNECTEDSTATE pfnInternetGetConnectedState;
 
         #define RESOLVE_FUNCTION(type, name) \