Fixed compilation, sorry for that.

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index b752cc3c748b2952ac9844e39892edc13d422250..68a16fceaf189cbd1f9c03e6a3f1cf2649cd888e 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -72,7 +72,7 @@ class wxDllLoader
        @param success Must point to a bool variable which will be set to TRUE or FALSE.
        @return A handle to the loaded DLL. Use success parameter to test if it is valid.
    */
        @param success Must point to a bool variable which will be set to TRUE or FALSE.
        @return A handle to the loaded DLL. Use success parameter to test if it is valid.
    */

-   static wxDllType LoadDll(const wxString & libname, bool *success);
+   static wxDllType LoadLibrary(const wxString & libname, bool *success);

    /** This function resolves a symbol in a loaded DLL, such as a
        variable or function name.
        @param dllHandle Handle of the DLL, as returned by LoadDll().
    /** This function resolves a symbol in a loaded DLL, such as a
        variable or function name.
        @param dllHandle Handle of the DLL, as returned by LoadDll().

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 1e0fc6bdf449d42be7b2db2e6e7844aae99936ca..dd2cfa443e0711fe57dc771001a9632e3c16bb96 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -174,7 +174,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 
 /* static */
 wxDllType
 
 /* static */
 wxDllType

-wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
+wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)

 {
    wxASSERT(success);
    
 {
    wxASSERT(success);
    


@@ -231,7 +231,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
     if ( !symbol )
     {
        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
     if ( !symbol )
     {
        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),

-                     symbname.c_str());
+                     name.c_str());

     }
     return symbol;
 }
     }
     return symbol;
 }


@@ -300,8 +300,8 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 #endif // __UNIX__
 #endif
 
 #endif // __UNIX__
 #endif
 

-    bool success;
-    handle = wxDllLoader::LoadDll(lib_name, &success);
+    bool success = FALSE;
+    wxDllType handle = wxDllLoader::LoadDll(lib_name, &success);

     if(success)
     {
        lib = new wxLibrary(handle);
     if(success)
     {
        lib = new wxLibrary(handle);