wxWidgets3: update to svn r70933

This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions

View File

@ -3,7 +3,7 @@
// Purpose: common classes for persistence support
// Author: Vadim Zeitlin
// Created: 2009-01-18
// RCS-ID: $Id: persist.h 64887 2010-07-11 10:44:23Z VZ $
// RCS-ID: $Id: persist.h 69583 2011-10-30 10:08:18Z VZ $
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -44,6 +44,14 @@ wxPersistentObject *wxCreatePersistentObject(T *obj);
class WXDLLIMPEXP_CORE wxPersistenceManager
{
public:
// Call this method to specify a non-default persistence manager to use.
// This function should usually be called very early to affect creation of
// all persistent controls and the object passed to it must have a lifetime
// long enough to be still alive when the persistent controls are destroyed
// and need it to save their state so typically this would be a global or a
// wxApp member.
static void Set(wxPersistenceManager& manager);
// accessor to the unique persistence manager object
static wxPersistenceManager& Get();
@ -133,7 +141,7 @@ public:
#undef wxPERSIST_DECLARE_SAVE_RESTORE_FOR
private:
protected:
// ctor is private, use Get()
wxPersistenceManager()
{
@ -142,15 +150,18 @@ private:
}
// helpers of Save/Restore()
//
// TODO: make this customizable by allowing
// (a) specifying custom wxConfig object to use
// (b) allowing to use something else entirely
wxConfigBase *GetConfig() const { return wxConfigBase::Get(); }
wxString GetKey(const wxPersistentObject& who, const wxString& name) const;
// Return the config object to use, by default just the global one but a
// different one could be used by the derived class if needed.
virtual wxConfigBase *GetConfig() const { return wxConfigBase::Get(); }
// Return the path to use for saving the setting with the given name for
// the specified object (notice that the name is the name of the setting,
// not the name of the object itself which can be retrieved with GetName()).
virtual wxString GetKey(const wxPersistentObject& who,
const wxString& name) const;
private:
// map with the registered objects as keys and associated
// wxPersistentObjects as values
wxPersistentObjectsMap m_persistentObjects;