X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f89dbc48e4ffdec4ea55b5444c6df87df2d642d..36633c5c00d60bbcfffd9415c36f89579992b315:/src/msw/dialup.cpp?ds=sidebyside diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 60dd7bfd70..e8480bd8a3 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -841,17 +841,10 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, 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()); -#endif // we should still call RasHangUp() if we got a non 0 connection if ( ms_hRasConnection ) @@ -963,8 +956,8 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const if ( pfnInternetGetConnectedState(&flags, 0 /* reserved */) ) { // there is some connection to the net, see of which type - ms_isAlwaysOnline = (flags & INTERNET_CONNECTION_LAN != 0) || - (flags & INTERNET_CONNECTION_PROXY != 0); + ms_isAlwaysOnline = ((flags & INTERNET_CONNECTION_LAN) != 0) + || ((flags & INTERNET_CONNECTION_PROXY) != 0); } else { @@ -1093,8 +1086,8 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds) { // create a hidden window to receive notification about connections // status change - extern const wxChar *wxPanelClassName; - ms_hwndRas = ::CreateWindow(wxPanelClassName, NULL, + extern const wxChar *wxCanvasClassName; + ms_hwndRas = ::CreateWindow(wxCanvasClassName, NULL, 0, 0, 0, 0, 0, NULL, (HMENU)NULL, wxGetInstance(), 0);