Update configuration for OpenVMS

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 6f842edb17dd3e3c146f440156a525648652ec9a..3d31beeb80aeaae7e6daa6143b5ae00b04a8410c 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -42,14 +42,15 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 // native version, even if configure detected presence of DLOPEN.
 #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
     typedef HMODULE             wxDllType;
 // native version, even if configure detected presence of DLOPEN.
 #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
     typedef HMODULE             wxDllType;

+#elif defined(__DARWIN__)
+    // Don't include dlfcn.h on Darwin, we may be using our own replacements.
+    typedef void               *wxDllType;

 #elif defined(HAVE_DLOPEN)
     #include <dlfcn.h>
     typedef void               *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
     #include <dl.h>
     typedef shl_t               wxDllType;
 #elif defined(HAVE_DLOPEN)
     #include <dlfcn.h>
     typedef void               *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
     #include <dl.h>
     typedef shl_t               wxDllType;

-#elif defined(__DARWIN__)
-    typedef void               *wxDllType;

 #elif defined(__WXMAC__)
     #include <CodeFragments.h>
     typedef CFragConnectionID   wxDllType;
 #elif defined(__WXMAC__)
     #include <CodeFragments.h>
     typedef CFragConnectionID   wxDllType;


@@ -72,9 +73,19 @@ enum wxDLFlags
     wxDL_VERBATIM   = 0x00000008,   // attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.
     wxDL_VERBATIM   = 0x00000008,   // attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.

+
+    // this flag is obsolete, don't use

     wxDL_NOSHARE    = 0x00000010,   // load new DLL, don't reuse already loaded
                                     // (only for wxPluginManager)
 
     wxDL_NOSHARE    = 0x00000010,   // load new DLL, don't reuse already loaded
                                     // (only for wxPluginManager)
 

+    wxDL_QUIET      = 0x00000020,   // don't log an error if failed to load
+
+    // this flag is dangerous, for internal use of wxMSW only, don't use
+    wxDL_GET_LOADED = 0x00000040,   // Win32 only: return handle of already
+                                    // loaded DLL or NULL otherwise; Unload()
+                                    // should not be called so don't forget to
+                                    // Detach() if you use this function
+

     wxDL_DEFAULT    = wxDL_NOW      // default flags correspond to Win32
 };
 
     wxDL_DEFAULT    = wxDL_NOW      // default flags correspond to Win32
 };
 


@@ -112,8 +123,11 @@ enum wxPluginCategory
 // with "_t" but it doesn't define a variable but just assigns the loaded value
 // to it and also allows to pass it the prefix to be used instead of hardcoding
 // "pfn" (the prefix can be "m_" or "gs_pfn" or whatever)
 // with "_t" but it doesn't define a variable but just assigns the loaded value
 // to it and also allows to pass it the prefix to be used instead of hardcoding
 // "pfn" (the prefix can be "m_" or "gs_pfn" or whatever)

+//
+// notice that this function doesn't generate error messages if the symbol
+// couldn't be loaded, the caller should generate the appropriate message

 #define wxDL_INIT_FUNC(pfx, name, dynlib) \
 #define wxDL_INIT_FUNC(pfx, name, dynlib) \

-    pfx ## name = (name ## _t)(dynlib).GetSymbol(#name)
+    pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name)

 
 #ifdef __WXMSW__
 
 
 #ifdef __WXMSW__