Applied patch [ 807164 ] fixes for core library

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

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index fa9bb8143f98e72501b2fd6aee628a9df4fe30b3..3ccfba7a7fa5f5c79df8b8b89d5fdd3c808d7a73 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -215,6 +215,8 @@ private:
 
     private:
         wxDialUpManagerMSW *m_dialUpManager;
 
     private:
         wxDialUpManagerMSW *m_dialUpManager;

+
+        DECLARE_NO_COPY_CLASS(RasTimer)

     } m_timerStatusPolling;
 
     // thread handle for the thread sitting on connection change event
     } m_timerStatusPolling;
 
     // thread handle for the thread sitting on connection change event


@@ -264,6 +266,8 @@ private:
 
     // this flag tells us whether a call to RasDial() is in progress
     static wxDialUpManagerMSW *ms_dialer;
 
     // this flag tells us whether a call to RasDial() is in progress
     static wxDialUpManagerMSW *ms_dialer;

+
+    DECLARE_NO_COPY_CLASS(wxDialUpManagerMSW)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -957,6 +961,12 @@ bool wxDialUpManagerMSW::IsOnline() const
 {
     wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
 
 {
     wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") );
 

+    if ( IsAlwaysOnline() )
+    {
+        // always => now
+        return true;
+    }
+

     if ( ms_userSpecifiedOnlineStatus != -1 )
     {
         // user specified flag overrides our logic
     if ( ms_userSpecifiedOnlineStatus != -1 )
     {
         // user specified flag overrides our logic


@@ -1236,7 +1246,7 @@ static LRESULT APIENTRY wxRasStatusWindowProc(HWND hWnd, UINT message,
     return 0;
 }
 
     return 0;
 }
 

-static void WINAPI wxRasDialFunc(UINT unMsg,
+static void WINAPI wxRasDialFunc(UINT WXUNUSED(unMsg),

                                  RASCONNSTATE rasconnstate,
                                  DWORD dwError)
 {
                                  RASCONNSTATE rasconnstate,
                                  DWORD dwError)
 {