wxUSE_CRASHREPORT and wxUSE_STACKWALKER can't be used if wxUSE_ON_FATAL_EXCEPTION...

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index c5f3585ec6b65769ead955362593da6d09b22df8..d70c8cfa1f0aba7f31589a94d3c106f81fe78636 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -7,7 +7,7 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
-// Licence:      wxWidgets licence
+// Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DYNAMICLOADER_H__
@@ -116,17 +116,17 @@ public:
         // macro because it's of arguable use outside of that.
 
 #if WXWIN_COMPATIBILITY_2_2
-    static wxPluginLibrary *GetObjectFromHandle(wxDllType handle);
+    wxDEPRECATED( static wxPluginLibrary *GetObjectFromHandle(wxDllType handle) );
 #endif
 
         // Instance methods.
 
-    wxPluginManager() : m_entry(NULL) {};
+    wxPluginManager() : m_entry(NULL) {}
     wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT)
     {
         Load(libname, flags);
     }
-    ~wxPluginManager() { Unload(); }
+    ~wxPluginManager() { if ( IsLoaded() ) Unload(); }
 
     bool   Load(const wxString &libname, int flags = wxDL_DEFAULT);
     void   Unload();