fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/persist.h b/include/wx/persist.h
index ff2aabab10e8dc3b4ba4a5851520568d98473f55..a46935fd90c17b6a6407fee24e3d1bafd7885d52 100644 (file)
--- a/include/wx/persist.h
+++ b/include/wx/persist.h
@@ -47,6 +47,11 @@ public:
     // accessor to the unique persistence manager object
     static wxPersistenceManager& Get();
 
     // accessor to the unique persistence manager object
     static wxPersistenceManager& Get();
 

+    // trivial but virtual dtor
+    //
+    // FIXME-VC6: this only needs to be public because of VC6 bug
+    virtual ~wxPersistenceManager();
+

 
     // globally disable restoring or saving the persistent properties (both are
     // enabled by default)
 
     // globally disable restoring or saving the persistent properties (both are
     // enabled by default)


@@ -77,7 +82,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 +141,7 @@ private:
         m_doRestore = true;
     }
 
         m_doRestore = true;
     }
 

+

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


@@ -155,7 +161,7 @@ private:
     bool m_doSave,
          m_doRestore;
 
     bool m_doSave,
          m_doRestore;
 

-    DECLARE_NO_COPY_CLASS(wxPersistenceManager)
+    wxDECLARE_NO_COPY_CLASS(wxPersistenceManager);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -212,8 +218,26 @@ protected:
 private:
     void * const m_obj;
 
 private:
     void * const m_obj;
 

-    DECLARE_NO_COPY_CLASS(wxPersistentObject)
+    wxDECLARE_NO_COPY_CLASS(wxPersistentObject);

 };
 
 };
 

+// FIXME-VC6: VC6 has troubles with template methods of DLL-exported classes,
+//            apparently it believes they should be defined in the DLL (which
+//            is, of course, impossible as the DLL doesn't know for which types
+//            will they be instantiated) instead of compiling them when
+//            building the main application itself. Because of this problem
+//            (which only arises in debug build!) we can't use the usual
+//            RegisterAndRestore(obj) with it and need to explicitly create the
+//            persistence adapter. To hide this ugliness we define a global
+//            function which does it for us.
+template <typename T>
+inline bool wxPersistentRegisterAndRestore(T *obj)
+{
+    wxPersistentObject * const pers = wxCreatePersistentObject(obj);
+
+    return wxPersistenceManager::Get().RegisterAndRestore(obj, pers);
+
+}
+

 #endif // _WX_PERSIST_H_
 
 #endif // _WX_PERSIST_H_