Implement new static Unload(handle) instead of old Unload()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 06432ca9875c9ac8ca64ae6a92fe551826b9646f..3ab2153462afdfdcaad3c8c0af9d4be295db10c8 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -300,25 +300,21 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
     return IsLoaded();
 }
 
     return IsLoaded();
 }
 

-void wxDynamicLibrary::Unload()
+/* static */ void wxDynamicLibrary::Unload(wxDllType handle)

 {
 {

-    if( IsLoaded() )
-    {

 #if defined(__WXPM__) || defined(__EMX__)
 #if defined(__WXPM__) || defined(__EMX__)

-        DosFreeModule( m_handle );
+    DosFreeModule( handle );

 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)

-        dlclose( m_handle );
+    dlclose( handle );

 #elif defined(HAVE_SHL_LOAD)
 #elif defined(HAVE_SHL_LOAD)

-        shl_unload( m_handle );
+    shl_unload( handle );

 #elif defined(__WINDOWS__)
 #elif defined(__WINDOWS__)

-        ::FreeLibrary( m_handle );
+    ::FreeLibrary( handle );

 #elif defined(__WXMAC__) && !defined(__DARWIN__)
 #elif defined(__WXMAC__) && !defined(__DARWIN__)

-        CloseConnection( (CFragConnectionID*) &m_handle );
+    CloseConnection( (CFragConnectionID*) &handle );

 #else
 #error  "runtime shared lib support not implemented"
 #endif
 #else
 #error  "runtime shared lib support not implemented"
 #endif

-        m_handle = 0;
-    }

 }
 
 void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 }
 
 void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const