X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2afb7abec64fc601ff7ab622a865ef5ec68d10..c980c992630e94e71139660631a77ffbca8ed958:/include/wx/dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index b752cc3c74..5788c2a743 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -48,9 +48,10 @@
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 
-// defined in windows.h
-#ifdef LoadLibrary
-#   undef LoadLibrary
+// LoadLibrary is defined in windows.h as LoadLibraryA, but wxDllLoader method
+// should be called LoadLibrary, not LoadLibraryA or LoadLibraryW!
+#if defined(__WIN32__) && defined(LoadLibrary)
+#   include "wx/msw/winundef.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -72,7 +73,12 @@ 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.
    */
-   static wxDllType LoadDll(const wxString & libname, bool *success);
+   static wxDllType LoadLibrary(const wxString & libname, bool *success = NULL);
+   /** This function unloads the shared library. */
+   static void UnloadLibrary(wxDllType dll);
+   /** This function returns a valid handle for the main program
+       itself. */
+   static wxDllType GetProgramHandle(void);
    /** 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().