fix (harmless for now) g++ warning about non-virtual dtor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/persist.h b/include/wx/persist.h
index 24cd503142d3278ce910eca0727094367879ce01..392bf53d9b089618fa3b53bfb0435e109790d7da 100644 (file)
--- a/include/wx/persist.h
+++ b/include/wx/persist.h
@@ -77,7 +77,7 @@ public:
     // deletes the associated wxPersistentObject
     void Unregister(void *obj);
 
     // deletes the associated wxPersistentObject
     void Unregister(void *obj);
 

-    
+

     // save/restore the state of an object
     //
     // these methods do nothing if DisableSaving/Restoring() was called
     // save/restore the state of an object
     //
     // these methods do nothing if DisableSaving/Restoring() was called


@@ -136,6 +136,10 @@ private:
         m_doRestore = true;
     }
 
         m_doRestore = true;
     }
 

+    // trivial but virtual dtor
+    virtual ~wxPersistenceManager();
+
+

     // helpers of Save/Restore()
     //
     // TODO: make this customizable by allowing
     // helpers of Save/Restore()
     //
     // TODO: make this customizable by allowing


@@ -230,7 +234,7 @@ inline bool wxPersistentRegisterAndRestore(T *obj)
     wxPersistentObject * const pers = wxCreatePersistentObject(obj);
 
     return wxPersistenceManager::Get().RegisterAndRestore(obj, pers);
     wxPersistentObject * const pers = wxCreatePersistentObject(obj);
 
     return wxPersistenceManager::Get().RegisterAndRestore(obj, pers);

-                                            
+

 }
 
 #endif // _WX_PERSIST_H_
 }
 
 #endif // _WX_PERSIST_H_

diff --git a/src/common/persist.cpp b/src/common/persist.cpp
index 52c4513924da38efd06d3ecb28c716bc5c8a6cff..76ab2698bdcde2c7d133df5071b5953b8686da92 100644 (file)
--- a/src/common/persist.cpp
+++ b/src/common/persist.cpp
@@ -40,6 +40,10 @@ wxPersistenceManager& wxPersistenceManager::Get()
     return s_manager;
 }
 
     return s_manager;
 }
 

+wxPersistenceManager::~wxPersistenceManager()
+{
+}
+

 wxString
 wxPersistenceManager::GetKey(const wxPersistentObject& who,
                              const wxString& name) const
 wxString
 wxPersistenceManager::GetKey(const wxPersistentObject& who,
                              const wxString& name) const