From: Vadim Zeitlin Date: Fri, 17 Jan 2003 20:52:39 +0000 (+0000) Subject: use wxDynamicLibrary instead of wxPluginManager X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4522bb3ecfa890603777a291ac77f0789c467b52?ds=inline use wxDynamicLibrary instead of wxPluginManager git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 81ff0b817a..8cb950ef6b 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -225,7 +225,7 @@ private: wxRasThreadData m_data; // the handle of rasapi32.dll when it's loaded - wxPluginManager m_dllRas; + wxDynamicLibrary m_dllRas; // the hidden window we use for passing messages between threads static HWND ms_hwndRas; @@ -233,12 +233,6 @@ private: // the handle of the connection we initiated or 0 if none static HRASCONN ms_hRasConnection; - // FIXME: There is probably no reason these really need to - // be static anymore since the dll refcounting is - // handled by wxPluginManager now. Whether or not - // we still _want_ them to be static is another - // issue entirely.. - // the pointers to RAS functions static RASDIAL ms_pfnRasDial; static RASENUMCONNECTIONS ms_pfnRasEnumConnections; @@ -337,8 +331,8 @@ wxDialUpManager *wxDialUpManager::Create() #endif // VC++ wxDialUpManagerMSW::wxDialUpManagerMSW() - : m_timerStatusPolling(this) - , m_dllRas(_T("RASAPI32")) + : m_timerStatusPolling(this), + m_dllRas(_T("RASAPI32")) { // initialize our data m_hThread = 0; @@ -932,7 +926,7 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const // but we allow multiple instances of wxDialUpManagerMSW so // we might as well use the ref counted version here too. - wxPluginManager hDll(_T("WININET")); + wxDynamicLibrary hDll(_T("WININET")); if ( hDll.IsLoaded() ) { typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);