From e62e17d735952238929ad351d195a46270a62edb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 Mar 2005 20:37:53 +0000
Subject: [PATCH] changed wxDL_DEFAULT to be same as wxDL_NOW as this makes
 more sense for portable programs because wxDL_NOW is the only flag supported
 by Win32

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/dynlib.tex |  1 +
 include/wx/dynlib.h      | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/latex/wx/dynlib.tex b/docs/latex/wx/dynlib.tex
index a47d026205..f29e1ca6d1 100644
--- a/docs/latex/wx/dynlib.tex
+++ b/docs/latex/wx/dynlib.tex
@@ -147,6 +147,7 @@ be a combination of the following bits:
 \twocolitem{wxDL\_GLOBAL}{equivalent of RTLD\_GLOBAL under Unix, ignored elsewhere}
 \twocolitem{wxDL\_VERBATIM}{don't try to append the appropriate extension to
 the library name (this is done by default).}
+\twocolitem{wxDL\_DEFAULT}{default flags, same as wxDL\_NOW currently}
 \end{twocollist}
 
 Returns \true if the library was successfully loaded, \false otherwise.
diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 70287c0b19..4eeaffef92 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -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
-- 
2.50.0

