Standard frame resource defines for OS/2

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 08026653776377f1eca45d7093fa55ad24f51428..313180829c1f24ce3adf377abcf06c6b9fa46b1d 100644 (file)
--- 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))
@@ -33,18 +33,20 @@
 #   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)
 #   include <dl.h>
     typedef shl_t wxDllType;
 #elif defined(__WINDOWS__)
-#   include <windows.h>
-    typedef HMODULE wxDllType;
-#elif defined(__OS2__)
-#   define INCL_DOS
-#   include <os2.h>
+#   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
@@ -61,6 +63,7 @@
 // ----------------------------------------------------------------------------
 // wxDllLoader
 // ----------------------------------------------------------------------------
+
 /** wxDllLoader is a class providing an interface similar to unix's
     dlopen(). It is used by the wxLibrary framework and manages the
     actual loading of DLLs and the resolving of symbols in them.
@@ -69,30 +72,31 @@
 */
 class wxDllLoader
 {
- public:
-   /** This function loads a shared library into memory, with libname
-       being the basename of the library, without the filename
-       extension. No initialisation of the library will be done.
-       @param libname Name of the shared object to load.
-       @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 = NULL);
-   /** This function unloads the shared library. */
-   static void UnloadLibrary(wxDllType dll);
-   /** This function returns a valid handle for the main program
-       itself. */
-   static wxDllType GetProgramHandle(void);
-   /** This function resolves a symbol in a loaded DLL, such as a
-       variable or function name.
-       @param dllHandle Handle of the DLL, as returned by LoadDll().
-       @param name Name of the symbol.
-       @return A pointer to the symbol.
-   */
-   static void * GetSymbol(wxDllType dllHandle, const wxString &name);
- private:
-   /// forbid construction of objects
-   wxDllLoader();
+public:
+    /** This function loads a shared library into memory, with libname
+      being the basename of the library, without the filename
+      extension. No initialisation of the library will be done.
+      @param libname Name of the shared object to load.
+      @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 = NULL);
+    /** This function unloads the shared library. */
+    static void UnloadLibrary(wxDllType dll);
+    /** This function returns a valid handle for the main program
+      itself. */
+    static wxDllType GetProgramHandle(void);
+    /** This function resolves a symbol in a loaded DLL, such as a
+      variable or function name.
+      @param dllHandle Handle of the DLL, as returned by LoadDll().
+      @param name Name of the symbol.
+      @return A pointer to the symbol.
+     */
+    static void * GetSymbol(wxDllType dllHandle, const wxString &name);
+
+private:
+    /// forbid construction of objects
+    wxDllLoader();
 };
 
 // ----------------------------------------------------------------------------