X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..4a2d030adfa836f6ada1830c9057170d053bcc64:/src/msw/dialup.cpp?ds=sidebyside diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 24c13f4da6..11dd018294 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 07.07.99 -// RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,6 +38,8 @@ #include "wx/generic/choicdgg.h" +#include "wx/msw/private.h" +#include "wx/msw/private/hiddenwin.h" #include "wx/dynlib.h" wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent ); @@ -65,10 +66,6 @@ wxDEFINE_EVENT( wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent ); #define INTERNET_CONNECTION_PROXY 4 #endif -// implemented in utils.cpp -extern "C" WXDLLIMPEXP_BASE HWND -wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); - static const wxChar * wxMSWDIALUP_WNDCLASSNAME = wxT("_wxDialUpManager_Internal_Class"); static const wxChar *gs_classForDialUpWindow = NULL; @@ -596,11 +593,7 @@ void wxDialUpManagerMSW::CleanUpThreadData() m_hThread = 0; } - if ( m_data ) - { - delete m_data; - m_data = NULL; - } + wxDELETE(m_data); } // ---------------------------------------------------------------------------- @@ -836,7 +829,6 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, // default values for other fields rasDialParams.szPhoneNumber[0] = '\0'; rasDialParams.szCallbackNumber[0] = '\0'; - rasDialParams.szCallbackNumber[0] = '\0'; rasDialParams.szDomain[0] = '*'; rasDialParams.szDomain[1] = '\0'; @@ -1291,7 +1283,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data) } // we don't need it any more now and if this thread ran, it is our - // responsability to free the data + // responsibility to free the data delete data; return 0;