oops, make it build with wxbase too.

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 683cd67ac205f1aa7aa512e0547f173e3f35a812..11462250d63f570f816da81aa26958b70a900cc0 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dynload.h"
 #endif
 
 #pragma interface "dynload.h"
 #endif
 


@@ -87,6 +87,10 @@ enum wxDLFlags
     wxDL_VERBATIM   = 0x00000008,   // Attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.
     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
+
+    // FIXME: why? (VZ)

 #ifdef __osf__
     wxDL_DEFAULT    = wxDL_LAZY
 #else
 #ifdef __osf__
     wxDL_DEFAULT    = wxDL_LAZY
 #else


@@ -106,10 +110,10 @@ public:
 
         // return the platform standard DLL extension (with leading dot)
 
 
         // return the platform standard DLL extension (with leading dot)
 

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

 
     wxDynamicLibrary() : m_handle(0) {}
 
     wxDynamicLibrary() : m_handle(0) {}

-    wxDynamicLibrary(wxString libname, wxDLFlags flags = wxDL_DEFAULT)
+    wxDynamicLibrary(wxString libname, int flags = wxDL_DEFAULT)

         : m_handle(0)
     {
         Load(libname, flags);
         : m_handle(0)
     {
         Load(libname, flags);


@@ -123,7 +127,7 @@ public:
         // load the library with the given name
         // (full or not), return TRUE on success
 
         // load the library with the given name
         // (full or not), return TRUE on success
 

-    bool Load(wxString libname, wxDLFlags flags = wxDL_DEFAULT);
+    bool Load(wxString libname, int flags = wxDL_DEFAULT);

 
         // unload the library, also done automatically in dtor
 
 
         // unload the library, also done automatically in dtor
 


@@ -155,7 +159,7 @@ protected:
 
         // Platform specific shared lib suffix.
 
 
         // Platform specific shared lib suffix.
 

-    static const wxString ms_dllext;
+    static const wxChar *ms_dllext;

 
         // the handle to DLL or NULL
 
 
         // the handle to DLL or NULL
 


@@ -184,12 +188,12 @@ class WXDLLEXPORT wxPluginLibrary : public wxDynamicLibrary
 {
 public:
 
 {
 public:
 

-    static wxDLImports ms_classes;  // Static hash of all imported classes.
+    static wxDLImports* ms_classes;  // Static hash of all imported classes.

 
 

-    wxPluginLibrary( const wxString &libname, wxDLFlags flags = wxDL_DEFAULT );
+    wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );

     ~wxPluginLibrary();
 
     ~wxPluginLibrary();
 

-    wxPluginLibrary  *RefLib() { ++m_linkcount; return this; }
+    wxPluginLibrary  *RefLib();

     bool              UnrefLib();
 
         // These two are called by the PluginSentinel on (PLUGGABLE) object
     bool              UnrefLib();
 
         // These two are called by the PluginSentinel on (PLUGGABLE) object


@@ -241,7 +245,7 @@ public:
         // Static accessors.
 
     static wxPluginLibrary    *LoadLibrary( const wxString &libname,
         // Static accessors.
 
     static wxPluginLibrary    *LoadLibrary( const wxString &libname,

-                                            wxDLFlags flags = wxDL_DEFAULT );
+                                            int flags = wxDL_DEFAULT );

     static bool                UnloadLibrary(const wxString &libname);
 
         // This is used by wxDllLoader.  It's wrapped in the compatibility
     static bool                UnloadLibrary(const wxString &libname);
 
         // This is used by wxDllLoader.  It's wrapped in the compatibility


@@ -254,13 +258,13 @@ public:
         // Instance methods.
 
     wxPluginManager() : m_entry(0) {};
         // Instance methods.
 
     wxPluginManager() : m_entry(0) {};

-    wxPluginManager(const wxString &libname, wxDLFlags flags = wxDL_DEFAULT)
+    wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT)

     {
         Load(libname, flags);
     }
     ~wxPluginManager() { Unload(); }
 
     {
         Load(libname, flags);
     }
     ~wxPluginManager() { Unload(); }
 

-    bool   Load(const wxString &libname, wxDLFlags flags = wxDL_DEFAULT);
+    bool   Load(const wxString &libname, int flags = wxDL_DEFAULT);

     void   Unload();
 
     bool   IsLoaded() const { return m_entry && m_entry->IsLoaded(); }
     void   Unload();
 
     bool   IsLoaded() const { return m_entry && m_entry->IsLoaded(); }


@@ -269,10 +273,13 @@ public:
         return m_entry->GetSymbol( symbol, success );
     }
 
         return m_entry->GetSymbol( symbol, success );
     }
 

+    static void CreateManifest() { ms_manifest = new wxDLManifest(wxKEY_STRING); }
+    static void ClearManifest() { delete ms_manifest; ms_manifest = NULL; }
+

 private:
 
 private:
 

-    static wxDLManifest  ms_manifest;  // Static hash of loaded libs.
-    wxPluginLibrary     *m_entry;      // Cache our entry in the manifest.
+    static wxDLManifest* ms_manifest;  // Static hash of loaded libs.
+    wxPluginLibrary*     m_entry;      // Cache our entry in the manifest.

 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.
 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.


@@ -294,14 +301,14 @@ class WXDLLEXPORT wxDllLoader
 {
 public:
 
 {
 public:
 

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

     static void         UnloadLibrary(wxDllType dll);
 
     static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); }
 
     static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool *success = 0);
 
     static void         UnloadLibrary(wxDllType dll);
 
     static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); }
 
     static void *GetSymbol(wxDllType dllHandle, const wxString &name, bool *success = 0);
 

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

 
 private:
 
 
 private:
 


@@ -309,8 +316,6 @@ private:
 };
 #endif
 
 };
 #endif
 

-

 #endif  // wxUSE_DYNAMIC_LOADER
 #endif  // _WX_DYNAMICLOADER_H__
 
 #endif  // wxUSE_DYNAMIC_LOADER
 #endif  // _WX_DYNAMICLOADER_H__
 

-// vi:sts=4:sw=4:et