always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc...

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 683cd67ac205f1aa7aa512e0547f173e3f35a812..a1c19d73a9ddadb3da2f462fe26cfaf96fe0c7a6 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -13,7 +13,7 @@
 #ifndef _WX_DYNAMICLOADER_H__
 #define _WX_DYNAMICLOADER_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dynload.h"
 #endif
 
@@ -25,7 +25,7 @@
 
 #if wxUSE_DYNAMIC_LOADER
 
-#include "wx/hash.h"
+#include "wx/hashmap.h"
 #include "wx/module.h"
 
 // FIXME: can this go in private.h or something too??
@@ -38,11 +38,10 @@
 #include "wx/msw/private.h"
 #endif
 
-// Ugh, I'd much rather this was typesafe, but no time
-// to rewrite wxHashTable right now..
+class WXDLLEXPORT wxPluginLibrary;
 
-typedef wxHashTable wxDLManifest;
-typedef wxHashTable wxDLImports;
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxPluginLibrary *, wxDLManifest);
+typedef wxDLManifest wxDLImports;
 
 // ----------------------------------------------------------------------------
 // conditional compilation
@@ -87,6 +86,10 @@ enum wxDLFlags
     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
@@ -106,10 +109,10 @@ public:
 
         // 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(wxString libname, wxDLFlags flags = wxDL_DEFAULT)
+    wxDynamicLibrary(wxString libname, int flags = wxDL_DEFAULT)
         : m_handle(0)
     {
         Load(libname, flags);
@@ -123,7 +126,7 @@ public:
         // 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
 
@@ -155,7 +158,7 @@ protected:
 
         // Platform specific shared lib suffix.
 
-    static const wxString ms_dllext;
+    static const wxChar *ms_dllext;
 
         // the handle to DLL or NULL
 
@@ -164,7 +167,7 @@ protected:
         // no copy ctor/assignment operators
         // or we'd try to unload the library twice
 
-DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
+    DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
 };
 
 
@@ -184,12 +187,12 @@ class WXDLLEXPORT wxPluginLibrary : public wxDynamicLibrary
 {
 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  *RefLib() { ++m_linkcount; return this; }
+    wxPluginLibrary  *RefLib();
     bool              UnrefLib();
 
         // These two are called by the PluginSentinel on (PLUGGABLE) object
@@ -230,7 +233,7 @@ private:
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 
-DECLARE_NO_COPY_CLASS(wxPluginLibrary)
+    DECLARE_NO_COPY_CLASS(wxPluginLibrary)
 };
 
 
@@ -241,7 +244,7 @@ public:
         // 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
@@ -253,14 +256,14 @@ public:
 
         // Instance methods.
 
-    wxPluginManager() : m_entry(0) {};
-    wxPluginManager(const wxString &libname, wxDLFlags flags = wxDL_DEFAULT)
+    wxPluginManager() : m_entry(NULL) {};
+    wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT)
     {
         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(); }
@@ -269,15 +272,25 @@ public:
         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:
+    // return the pointer to the entry for the library with given name in
+    // ms_manifest or NULL if none
+    static wxPluginLibrary *FindByName(const wxString& name)
+    {
+        const wxDLManifest::iterator i = ms_manifest->find(name);
 
-    static wxDLManifest  ms_manifest;  // Static hash of loaded libs.
-    wxPluginLibrary     *m_entry;      // Cache our entry in the manifest.
+        return i == ms_manifest->end() ? NULL : i->second;
+    }
+
+    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.
-
-DECLARE_NO_COPY_CLASS(wxPluginManager)
+    DECLARE_NO_COPY_CLASS(wxPluginManager)
 };
 
 
@@ -294,14 +307,14 @@ class WXDLLEXPORT wxDllLoader
 {
 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 const wxString &GetDllExt() { return wxDynamicLibrary::GetDllExt(); }
+    static wxString GetDllExt() { return wxDynamicLibrary::GetDllExt(); }
 
 private:
 
@@ -309,8 +322,6 @@ private:
 };
 #endif
 
-
 #endif  // wxUSE_DYNAMIC_LOADER
 #endif  // _WX_DYNAMICLOADER_H__
 
-// vi:sts=4:sw=4:et