wxUSE_XML and wxUSE_XRC build fixes if expat is not enabled

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index 1484964048cf7b7a2e54af5e8cb7822c85c84217..2c80bede4f48d4eb83ddd9975733a43e3a876534 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -93,6 +93,8 @@ private:
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
     wxModuleList    m_wxmodules;    // any wxModules that we initialised.
 
+    void    UpdateClasses();        // Update ms_classes
+    void    RestoreClasses();       // Removes this library from ms_classes
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 
@@ -124,7 +126,7 @@ public:
     {
         Load(libname, flags);
     }
-    ~wxPluginManager() { Unload(); }
+    ~wxPluginManager() { if ( IsLoaded() ) Unload(); }
 
     bool   Load(const wxString &libname, int flags = wxDL_DEFAULT);
     void   Unload();