Store a pointer to the wxWindow in the wxWindowDC class

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 90fb2f1dc7e3675f13a5c9d9c6a56596a406adee..7870ed3fe8b0c8de0166e8d1b3e510fd43286455 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -6,19 +6,23 @@
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DYNLIB_H__
 #define _WX_DYNLIB_H__
 

-#ifdef __GNUG__
-#   pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#   pragma interface "dynlib.h"

 #endif
 
 #include "wx/setup.h"
 
 #endif
 
 #include "wx/setup.h"
 

-#if wxUSE_DYNLIB_CLASS
+#if wxUSE_DYNAMIC_LOADER
+
+#include "wx/dynload.h"  // Use the new (version of) wxDynamicLibrary instead
+
+#elif wxUSE_DYNLIB_CLASS

 
 #include "wx/string.h"
 #include "wx/list.h"
 
 #include "wx/string.h"
 #include "wx/list.h"


@@ -51,7 +55,7 @@
 #elif defined(__DARWIN__)
     typedef void *wxDllType;
 #elif defined(__WXMAC__)
 #elif defined(__DARWIN__)
     typedef void *wxDllType;
 #elif defined(__WXMAC__)

-    typedef CFragConnectionID wxDllType;
+    typedef void *wxDllType;

 #else
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS
 #else
 #   error "wxLibrary can't be compiled on this platform, sorry."
 #endif // OS


@@ -72,7 +76,7 @@
     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.
 */
     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 WXDLLEXPORT wxDllLoader
+class WXDLLIMPEXP_BASE wxDllLoader

 {
 public:
     /*
 {
 public:
     /*


@@ -85,7 +89,7 @@ public:
       if success pointer is not NULL, it will be filled with TRUE if everything
       went ok and FALSE otherwise
      */
       if success pointer is not NULL, it will be filled with TRUE if everything
       went ok and FALSE otherwise
      */

-    static wxDllType LoadLibrary(const wxString& libname, bool *success = NULL);
+    static wxDllType LoadLibrary(const wxString& libname, bool *success = 0);

 
     /*
       This function unloads the shared library previously loaded with
 
     /*
       This function unloads the shared library previously loaded with


@@ -109,21 +113,24 @@ public:
 
        Returns the pointer to the symbol or NULL on error.
      */
 
        Returns the pointer to the symbol or NULL on error.
      */

-    static void * GetSymbol(wxDllType dllHandle, const wxString &name);
+    static void *GetSymbol(wxDllType dllHandle,
+                           const wxString &name,
+                           bool *success = NULL);

 
     // return the standard DLL extension (with leading dot) for this platform
 
     // return the standard DLL extension (with leading dot) for this platform

-    static wxString GetDllExt();
+    static const wxString &GetDllExt() { return ms_dllext; }

 
 private:
     // forbid construction of objects
     wxDllLoader();
 
 private:
     // forbid construction of objects
     wxDllLoader();

+    static const wxString   ms_dllext;

 };
 
 // ----------------------------------------------------------------------------
 // wxDynamicLibrary - friendly interface to wxDllLoader
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxDynamicLibrary - friendly interface to wxDllLoader
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDynamicLibrary
+class WXDLLIMPEXP_BASE wxDynamicLibrary

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -178,7 +185,7 @@ private:
 // wxLibrary
 // ----------------------------------------------------------------------------
 
 // wxLibrary
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxLibrary(wxDllType handle);
 {
 public:
     wxLibrary(wxDllType handle);


@@ -203,7 +210,7 @@ public:
 // wxLibraries
 // ----------------------------------------------------------------------------
 
 // wxLibraries
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxLibraries
+class WXDLLIMPEXP_BASE wxLibraries

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


@@ -222,7 +229,7 @@ protected:
 // Global variables
 // ----------------------------------------------------------------------------
 
 // Global variables
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(wxLibraries) wxTheLibraries;
+extern WXDLLIMPEXP_DATA_BASE(wxLibraries) wxTheLibraries;

 
 // ----------------------------------------------------------------------------
 // Interesting defines
 
 // ----------------------------------------------------------------------------
 // Interesting defines