dropped in new wxMatrix (from wxCanvas)

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 90cfe6fa80f63d7f4335805cb0fd467384c9d745..b13587e3e5f877a439efe1def123adc01a22987b 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -16,13 +16,13 @@
 #   pragma interface
 #endif
 
 #   pragma interface
 #endif
 

-#include <wx/setup.h>
+#include "wx/setup.h"

 
 #if wxUSE_DYNLIB_CLASS
 
 
 #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))
 
 // this is normally done by configure, but I leave it here for now...
 #if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD))


@@ -33,14 +33,20 @@
 #   endif // Unix flavour
 #endif // !Unix or already have some HAVE_xxx defined
 
 #   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 <dlfcn.h>
     typedef void *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
 #   include <dl.h>
     typedef shl_t wxDllType;
 #elif defined(__WINDOWS__)

-#   include <windows.h>
+#   include <windows.h>         // needed to get HMODULE

     typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
     typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;


@@ -48,51 +54,59 @@
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 

-// defined in windows.h
-// This breaks app.cpp if RICHEDIT is included.
-#if 0
-#ifdef LoadLibrary
-#   undef LoadLibrary
-#endif
+// LoadLibrary is defined in windows.h as LoadLibraryA, but wxDllLoader method
+// should be called LoadLibrary, not LoadLibraryA or LoadLibraryW!
+#if defined(__WIN32__) && defined(LoadLibrary)
+#   include "wx/msw/winundef.h"

 #endif
 
 // ----------------------------------------------------------------------------
 // wxDllLoader
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------
 // 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.
     There are no instances of this class, it simply serves as a
     namespace for its static member functions.
 */
 /** 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.
     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
-       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);
-   /** 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);
+
+    // return the standard DLL extension (with leading dot) for this platform
+    static wxString GetDllExt();
+
+private:
+    /// forbid construction of objects
+    wxDllLoader();

 };
 
 // ----------------------------------------------------------------------------
 // wxLibrary
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxLibrary
 // ----------------------------------------------------------------------------
 

-class wxLibrary : public wxObject
+class WXDLLEXPORT wxLibrary : public wxObject

 {
 public:
     wxHashTable classTable;
 {
 public:
     wxHashTable classTable;


@@ -119,7 +133,7 @@ protected:
 // wxLibraries
 // ----------------------------------------------------------------------------
 
 // wxLibraries
 // ----------------------------------------------------------------------------
 

-class wxLibraries
+class WXDLLEXPORT wxLibraries

 {
 public:
     wxLibraries();
 {
 public:
     wxLibraries();