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

return const wxString& from wxFontMapper::GetDefaultConfigPath()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-28 18:57:36 +00:00
parent cfa3d7ba83
commit 75ce4cb180
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/fontmap.h
View File

@@ -122,7 +122,7 @@ public:
void SetConfigPath(const wxString& prefix); void SetConfigPath(const wxString& prefix);
// return default config path // return default config path
static const wxChar *GetDefaultConfigPath(); static const wxString& GetDefaultConfigPath();
#endif // wxUSE_CONFIG #endif // wxUSE_CONFIG

9
src/common/fmapbase.cpp
View File

@@ -337,10 +337,15 @@ void wxFontMapperBase::Reset()
// config usage customisation // config usage customisation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static wxString gs_defaultConfigPath(FONTMAPPER_ROOT_PATH);
/* static */ /* static */
const wxChar *wxFontMapperBase::GetDefaultConfigPath() const wxString& wxFontMapperBase::GetDefaultConfigPath()
{ {
return FONTMAPPER_ROOT_PATH; // NB: we return const wxString& and not wxString for compatibility
// with 2.8 that returned const wxChar*
return gs_defaultConfigPath;
} }
void wxFontMapperBase::SetConfigPath(const wxString& prefix) void wxFontMapperBase::SetConfigPath(const wxString& prefix)