*** empty log message ***

[wxWidgets.git] / include / wx / dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index b752cc3c748b2952ac9844e39892edc13d422250..eb402a3dd9348d8a683509462ea5181fcaa1dbb8 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -49,9 +49,12 @@
 #endif // OS
 
 // defined in windows.h
+// This breaks app.cpp if RICHEDIT is included.
+#if 0
 #ifdef LoadLibrary
 #   undef LoadLibrary
 #endif
+#endif
 
 // ----------------------------------------------------------------------------
 // wxDllLoader
@@ -72,7 +75,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);
+   /** 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().