fixed previous commit (no changes)

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 2ba2c3f4b6ccc620a973fc85ae973b175109e9cf..b13587e3e5f877a439efe1def123adc01a22987b 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -33,7 +33,13 @@
 #   endif // Unix flavour
 #endif // !Unix or already have some HAVE_xxx defined
 
-#if defined(HAVE_DLOPEN)
+// Note: WXPM/EMX has to be tested first, since we want to use
+// native version, even if configure detected presence of DLOPEN.
+#if defined(__WXPM__) || defined(__EMX__)
+#   define INCL_DOS
+#   include <os2.h>
+    typedef HMODULE wxDllType;
+#elif defined(HAVE_DLOPEN)
 #   include <dlfcn.h>
     typedef void *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
@@ -42,10 +48,6 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;
-#elif defined(__OS2__)
-#   define INCL_DOS
-#   include <os2.h>
-    typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
 #else
@@ -68,7 +70,7 @@
     There are no instances of this class, it simply serves as a
     namespace for its static member functions.
 */
-class wxDllLoader
+class WXDLLEXPORT wxDllLoader
 {
 public:
     /** This function loads a shared library into memory, with libname
@@ -92,6 +94,9 @@ public:
      */
     static void * GetSymbol(wxDllType dllHandle, const wxString &name);
 
+    // return the standard DLL extension (with leading dot) for this platform
+    static wxString GetDllExt();
+
 private:
     /// forbid construction of objects
     wxDllLoader();
@@ -101,7 +106,7 @@ private:
 // wxLibrary
 // ----------------------------------------------------------------------------
 
-class wxLibrary : public wxObject
+class WXDLLEXPORT wxLibrary : public wxObject
 {
 public:
     wxHashTable classTable;
@@ -128,7 +133,7 @@ protected:
 // wxLibraries
 // ----------------------------------------------------------------------------
 
-class wxLibraries
+class WXDLLEXPORT wxLibraries
 {
 public:
     wxLibraries();