use wxDynamicLibrary instead of wxPluginManager

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-17 20:52:39 +00:00
parent d66dcb6022
commit 4522bb3ecf

View File

@@ -225,7 +225,7 @@ private:
wxRasThreadData m_data; wxRasThreadData m_data;
// the handle of rasapi32.dll when it's loaded // 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 // the hidden window we use for passing messages between threads
static HWND ms_hwndRas; static HWND ms_hwndRas;
@@ -233,12 +233,6 @@ private:
// the handle of the connection we initiated or 0 if none // the handle of the connection we initiated or 0 if none
static HRASCONN ms_hRasConnection; 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 // the pointers to RAS functions
static RASDIAL ms_pfnRasDial; static RASDIAL ms_pfnRasDial;
static RASENUMCONNECTIONS ms_pfnRasEnumConnections; static RASENUMCONNECTIONS ms_pfnRasEnumConnections;
@@ -337,8 +331,8 @@ wxDialUpManager *wxDialUpManager::Create()
#endif // VC++ #endif // VC++
wxDialUpManagerMSW::wxDialUpManagerMSW() wxDialUpManagerMSW::wxDialUpManagerMSW()
: m_timerStatusPolling(this) : m_timerStatusPolling(this),
, m_dllRas(_T("RASAPI32")) m_dllRas(_T("RASAPI32"))
{ {
// initialize our data // initialize our data
m_hThread = 0; m_hThread = 0;
@@ -932,7 +926,7 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
// but we allow multiple instances of wxDialUpManagerMSW so // but we allow multiple instances of wxDialUpManagerMSW so
// we might as well use the ref counted version here too. // we might as well use the ref counted version here too.
wxPluginManager hDll(_T("WININET")); wxDynamicLibrary hDll(_T("WININET"));
if ( hDll.IsLoaded() ) if ( hDll.IsLoaded() )
{ {
typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD); typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);