X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/752c7d6bbdf97037c9a2bf20625b47951b76aa4a..9739d9ee8090965862ba623b09a8fba731dc3d5c:/include/wx/dynlib.h?ds=sidebyside

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index eb402a3dd9..e6b0bc8c14 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -16,13 +16,13 @@
 #   pragma interface
 #endif
 
-#include <wx/setup.h>
+#include "wx/setup.h"
 
 #if wxUSE_DYNLIB_CLASS
 
-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/hash.h>
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/hash.h"
 
 // this is normally done by configure, but I leave it here for now...
 #if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD))
@@ -42,18 +42,20 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>
     typedef HMODULE wxDllType;
+#elif defined(__OS2__)
+#   define INCL_DOS
+#   include <os2.h>
+    typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
 #else
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 
-// defined in windows.h
-// This breaks app.cpp if RICHEDIT is included.
-#if 0
-#ifdef LoadLibrary
-#   undef LoadLibrary
-#endif
+// 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
 
 // ----------------------------------------------------------------------------
@@ -75,7 +77,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.
    */
-   static wxDllType LoadLibrary(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