Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wxConfig object caching (m_config), which solves dangling pointer problem if the global config object changes (and just makes things simpler)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2005-12-29 01:49:55 +00:00
parent 61e6a2ab5e
commit 5bbca8b037
2 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/fontmap.h
View File

@@ -116,9 +116,6 @@ public:
// ----------------------------------------------------------------------
#if wxUSE_CONFIG && wxUSE_FILECONFIG
// set the config object to use (may be NULL to use default)
void SetConfig(wxConfigBase *config) { m_config = config; }
// set the root config path to use (should be an absolute path)
void SetConfigPath(const wxString& prefix);
@@ -129,8 +126,8 @@ public:
protected:
#if wxUSE_CONFIG && wxUSE_FILECONFIG
// get the config object we're using -- if it wasn't set explicitly, this
// function will use wxConfig::Get() to get the global one
// get the config object we're using -- either the global config object
// or a wxMemoryConfig object created by this class otherwise
wxConfigBase *GetConfig();
// gets the root path for our settings -- if it wasn't set explicitly, use
@@ -149,8 +146,7 @@ protected:
void RestorePath(const wxString& pathOld);
// config object and path (in it) to use
wxConfigBase *m_config;
bool m_configIsDummy;
wxConfigBase *m_configDummy;
wxString m_configRootPath;
#endif // wxUSE_CONFIG