solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Add default value for MakeConfigFileName() 2nd argument

Browse source 
Make it possible to call wxStandardPaths::MakeConfigFileName() without
explicitly specifying the convention to use, to make it conform to the
documentation (previously this only worked when calling the
wxStandardPathsBase version of the method).

Closes #18106.
This commit is contained in:
Vadim Zeitlin 2018-03-17 17:17:05 +01:00
parent aee46e075f
commit b97ea90f4f
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/wx/msw/stdpaths.h
View file

@ -30,7 +30,8 @@ public:
virtual wxString GetPluginsDir() const wxOVERRIDE;
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
virtual wxString MakeConfigFileName(const wxString& basename,
ConfigFileConv conv) const wxOVERRIDE;
ConfigFileConv conv = ConfigFileConv_Ext
) const wxOVERRIDE;
// MSW-specific methods

3
include/wx/osx/cocoa/stdpaths.h
View file

@ -33,7 +33,8 @@ public:
ResourceCat category = ResourceCat_None) const wxOVERRIDE;
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
virtual wxString MakeConfigFileName(const wxString& basename,
ConfigFileConv conv) const wxOVERRIDE;
ConfigFileConv conv = ConfigFileConv_Ext
) const wxOVERRIDE;
protected:
// Ctor is protected, use wxStandardPaths::Get() instead of instantiating

9
include/wx/stdpaths.h
View file

@ -252,9 +252,12 @@ public:
virtual wxString GetUserDataDir() const { return m_prefix; }
virtual wxString GetPluginsDir() const { return m_prefix; }
virtual wxString GetUserDir(Dir WXUNUSED(userDir)) const { return m_prefix; }
virtual wxString MakeConfigFileName(const wxString& basename,
ConfigFileConv WXUNUSED(conv)) const
{ return m_prefix + wxS("/") + basename; }
virtual wxString
MakeConfigFileName(const wxString& basename,
ConfigFileConv WXUNUSED(conv) = ConfigFileConv_Ext) const
{
return m_prefix + wxS("/") + basename;
}
protected:
// Ctor is protected because wxStandardPaths::Get() should always be used

3
include/wx/unix/stdpaths.h
View file

@ -50,7 +50,8 @@ public:
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
#endif
virtual wxString MakeConfigFileName(const wxString& basename,
ConfigFileConv conv) const wxOVERRIDE;
ConfigFileConv conv = ConfigFileConv_Ext
) const wxOVERRIDE;
protected:
// Ctor is protected, use wxStandardPaths::Get() instead of instantiating