Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index ae8e8e5e34625b620356aa90024c3525a75c7e63..d70c8cfa1f0aba7f31589a94d3c106f81fe78636 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -93,8 +93,8 @@ private:
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
     wxModuleList    m_wxmodules;    // any wxModules that we initialised.
 
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
     wxModuleList    m_wxmodules;    // any wxModules that we initialised.
 

-    void    UpdateClassInfo();      // Update the wxClassInfo table
-    void    RestoreClassInfo();     // Restore the original wxClassInfo state.
+    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.
 
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 


@@ -116,17 +116,17 @@ public:
         // macro because it's of arguable use outside of that.
 
 #if WXWIN_COMPATIBILITY_2_2
         // 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.
 
 #endif
 
         // Instance methods.
 

-    wxPluginManager() : m_entry(NULL) {};
+    wxPluginManager() : m_entry(NULL) {}

     wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT)
     {
         Load(libname, flags);
     }
     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();
 
     bool   Load(const wxString &libname, int flags = wxDL_DEFAULT);
     void   Unload();