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

fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig instance

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-07-06 16:23:37 +00:00
parent ffc93a32d8
commit 5fe8354960
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/fontmap.h
View File

@@ -166,6 +166,7 @@ protected:
#if wxUSE_CONFIG #if wxUSE_CONFIG
// config object and path (in it) to use // config object and path (in it) to use
wxConfigBase *m_config; wxConfigBase *m_config;
bool m_configIsDummy;
#endif #endif
wxString m_configRootPath; wxString m_configRootPath;

20
src/common/fontmap.cpp
View File

@@ -215,6 +215,7 @@ wxFontMapper::wxFontMapper()
{ {
#if wxUSE_CONFIG #if wxUSE_CONFIG
m_config = NULL; m_config = NULL;
m_configIsDummy = FALSE;
#endif // wxUSE_CONFIG #endif // wxUSE_CONFIG
#if wxUSE_GUI #if wxUSE_GUI
@@ -264,10 +265,27 @@ wxConfigBase *wxFontMapper::GetConfig()
// but will allow us to remember the results of the questions at // but will allow us to remember the results of the questions at
// least during this run // least during this run
m_config = new wxMemoryConfig; m_config = new wxMemoryConfig;
wxConfig::Set(m_config); m_configIsDummy = TRUE;
// VS: we can't call wxConfig::Set(m_config) here because that would
// disable automatic wxConfig instance creation if this code was
// called before wxApp::OnInit (this happens in wxGTK -- it sets
// default wxFont encoding in wxApp::Initialize())
} }
} }
if ( m_configIsDummy && wxConfig::Get(FALSE) != NULL )
{
// VS: in case we created dummy m_config (see above), we want to switch back
// to the real one as soon as one becomes available.
m_config = wxConfig::Get(FALSE);
m_configIsDummy = FALSE;
// FIXME: ideally, we should add keys from dummy config to the real one now,
// but it is a low-priority task because typical wxWin application
// either doesn't use wxConfig at all or creates wxConfig object in
// wxApp::OnInit(), before any real interaction with the user takes
// place...
}
return m_config; return m_config;
} }