X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f89dbc48e4ffdec4ea55b5444c6df87df2d642d..aaae8296646096f4f4e0cd6dc6ad77e1fed4c4c2:/include/wx/dynload.h?ds=sidebyside

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 683cd67ac2..4cfd2b5de8 100644
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -109,7 +109,7 @@ public:
     static const wxString   &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 +123,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
 
@@ -184,9 +184,9 @@ 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; }
@@ -241,7 +241,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
@@ -254,13 +254,13 @@ public:
         // 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(); }
 
-    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,10 +269,13 @@ 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:
 
-    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.