continue with other handlers if some handler fails in LoadFile() after returning...

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 92585ab36d160a3b08a34c62a293f3b6297fe89a..d4c710d9402cbb6860cf8476b9494aa85ee60952 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -25,7 +25,7 @@
 #include "wx/hashmap.h"
 #include "wx/module.h"
 
-class WXDLLIMPEXP_BASE wxPluginLibrary;
+class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
 
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,
@@ -82,8 +82,8 @@ public:
 
 private:
 
-    wxClassInfo    *m_before;       // sm_first before loading this lib
-    wxClassInfo    *m_after;        // ..and after.
+    const wxClassInfo    *m_before; // sm_first before loading this lib
+    const wxClassInfo    *m_after;  // ..and after.
 
     size_t          m_linkcount;    // Ref count of library link calls
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
@@ -108,13 +108,6 @@ public:
                                             int flags = wxDL_DEFAULT );
     static bool                UnloadLibrary(const wxString &libname);
 
-        // This is used by wxDllLoader.  It's wrapped in the compatibility
-        // macro because it's of arguable use outside of that.
-
-#if WXWIN_COMPATIBILITY_2_2
-    wxDEPRECATED( static wxPluginLibrary *GetObjectFromHandle(wxDllType handle) );
-#endif
-
         // Instance methods.
 
     wxPluginManager() : m_entry(NULL) {}