X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da55d0644f1cc11b5c55de4fc18d039f69666e86..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index c8d7e85e18..8bcc8b4d35 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -16,7 +16,7 @@
 #   pragma interface "dynlib.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_DYNLIB_CLASS
 
@@ -69,21 +69,18 @@ class WXDLLIMPEXP_BASE wxDynamicLibraryDetailsCreator;
 enum wxDLFlags
 {
     wxDL_LAZY       = 0x00000001,   // resolve undefined symbols at first use
+                                    // (only works on some Unix versions)
     wxDL_NOW        = 0x00000002,   // resolve undefined symbols on load
+                                    // (default, always the case under Win32)
     wxDL_GLOBAL     = 0x00000004,   // export extern symbols to subsequently
                                     // loaded libs.
-    wxDL_VERBATIM   = 0x00000008,   // Attempt to load the supplied library
+    wxDL_VERBATIM   = 0x00000008,   // attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.
-
     wxDL_NOSHARE    = 0x00000010,   // load new DLL, don't reuse already loaded
+                                    // (only for wxPluginManager)
 
-    // FIXME: why? (VZ)
-#ifdef __osf__
-    wxDL_DEFAULT    = wxDL_LAZY
-#else
-    wxDL_DEFAULT    = wxDL_LAZY | wxDL_GLOBAL
-#endif
+    wxDL_DEFAULT    = wxDL_NOW      // default flags correspond to Win32
 };
 
 enum wxDynamicLibraryCategory
@@ -243,7 +240,11 @@ public:
     static void *RawGetSymbol(wxDllType handle, const wxString& name);
     void *RawGetSymbol(const wxString& name) const
     {
+#if defined (__WXPM__) || defined(__EMX__)
+        return GetSymbol(name);
+#else
         return RawGetSymbol(m_handle, name);
+#endif
     }
 
     // return all modules/shared libraries in the address space of this process