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

take wxString, not wxChar* in wxStandardPaths::GetLocalizedResourcesDir

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-23 19:10:36 +00:00
parent befda04080
commit e0b3b9d044
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/stdpaths.tex
View File

@@ -154,7 +154,7 @@ under Unix where it returns \texttt{/etc/\textit{appname}}.
\membersection{wxStandardPaths::GetLocalizedResourcesDir}\label{wxstandardpathsgetlocalizedresourcesdir} \membersection{wxStandardPaths::GetLocalizedResourcesDir}\label{wxstandardpathsgetlocalizedresourcesdir}
\constfunc{wxString}{GetLocalizedResourcesDir}{\param{const wxChar*}{ lang}, \param{ResourceCat}{ category = ResourceCat\_None}} \constfunc{wxString}{GetLocalizedResourcesDir}{\param{const wxString\&}{ lang}, \param{ResourceCat}{ category = ResourceCat\_None}}
Return the localized resources directory containing the resource files of the Return the localized resources directory containing the resource files of the
specified category for the given language. specified category for the given language.

2
include/wx/mac/corefoundation/stdpaths.h
View File

@@ -42,7 +42,7 @@ public:
virtual wxString GetPluginsDir() const; virtual wxString GetPluginsDir() const;
virtual wxString GetResourcesDir() const; virtual wxString GetResourcesDir() const;
virtual wxString virtual wxString
GetLocalizedResourcesDir(const wxChar *lang, GetLocalizedResourcesDir(const wxString& lang,
ResourceCat category = ResourceCat_None) const; ResourceCat category = ResourceCat_None) const;
virtual wxString GetDocumentsDir() const; virtual wxString GetDocumentsDir() const;

2
include/wx/stdpaths.h
View File

@@ -109,7 +109,7 @@ public:
// different under Unix for message catalog category (namely the standard // different under Unix for message catalog category (namely the standard
// prefix/share/locale/lang/LC_MESSAGES) // prefix/share/locale/lang/LC_MESSAGES)
virtual wxString virtual wxString
GetLocalizedResourcesDir(const wxChar *lang, GetLocalizedResourcesDir(const wxString& lang,
ResourceCat WXUNUSED(category) ResourceCat WXUNUSED(category)
= ResourceCat_None) const = ResourceCat_None) const
{ {

2
include/wx/unix/stdpaths.h
View File

@@ -45,7 +45,7 @@ public:
virtual wxString GetLocalDataDir() const; virtual wxString GetLocalDataDir() const;
virtual wxString GetUserDataDir() const; virtual wxString GetUserDataDir() const;
virtual wxString GetPluginsDir() const; virtual wxString GetPluginsDir() const;
virtual wxString GetLocalizedResourcesDir(const wxChar *lang, virtual wxString GetLocalizedResourcesDir(const wxString& lang,
ResourceCat category) const; ResourceCat category) const;
private: private:

2
src/mac/corefoundation/stdpaths_cf.cpp
View File

@@ -201,7 +201,7 @@ wxString wxStandardPathsCF::GetResourcesDir() const
} }
wxString wxString
wxStandardPathsCF::GetLocalizedResourcesDir(const wxChar *lang, wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,
ResourceCat category) const ResourceCat category) const
{ {
return wxStandardPathsBase:: return wxStandardPathsBase::

4
src/unix/stdpaths.cpp
View File

@@ -94,7 +94,7 @@ wxString wxStandardPaths::GetPluginsDir() const
} }
wxString wxString
wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
ResourceCat category) const ResourceCat category) const
{ {
return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category); return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
@@ -206,7 +206,7 @@ wxString wxStandardPaths::GetPluginsDir() const
} }
wxString wxString
wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
ResourceCat category) const ResourceCat category) const
{ {
if ( category != ResourceCat_Messages ) if ( category != ResourceCat_Messages )