(1) fixed bug: wxFontMapper no longer creates wxConfig instance by calling wxConfig::Get, now uses wxConfig::Get(FALSE) ;; (2) changed default config path to wxWindows/FontMapper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,7 +47,7 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// the config paths we use
|
// the config paths we use
|
||||||
static const wxChar* FONTMAPPER_ROOT_PATH = wxT("FontMapper");
|
static const wxChar* FONTMAPPER_ROOT_PATH = wxT("wxWindows/FontMapper");
|
||||||
static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
|
static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
|
||||||
static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
|
static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
|
||||||
static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
|
static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
|
||||||
@@ -223,7 +223,7 @@ wxConfigBase *wxFontMapper::GetConfig()
|
|||||||
if ( !m_config )
|
if ( !m_config )
|
||||||
{
|
{
|
||||||
// try the default
|
// try the default
|
||||||
m_config = wxConfig::Get();
|
m_config = wxConfig::Get(FALSE/*don't create on demand*/);
|
||||||
}
|
}
|
||||||
|
|
||||||
return m_config;
|
return m_config;
|
||||||
|
Reference in New Issue
Block a user