From e0b3b9d044746a258f93ae7c66550788d08d028e Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 23 May 2007 19:10:36 +0000 Subject: [PATCH] take wxString, not wxChar* in wxStandardPaths::GetLocalizedResourcesDir git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/stdpaths.tex | 2 +- include/wx/mac/corefoundation/stdpaths.h | 2 +- include/wx/stdpaths.h | 2 +- include/wx/unix/stdpaths.h | 2 +- src/mac/corefoundation/stdpaths_cf.cpp | 2 +- src/unix/stdpaths.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/latex/wx/stdpaths.tex b/docs/latex/wx/stdpaths.tex index ff39c09ebf..6223e840b4 100644 --- a/docs/latex/wx/stdpaths.tex +++ b/docs/latex/wx/stdpaths.tex @@ -154,7 +154,7 @@ under Unix where it returns \texttt{/etc/\textit{appname}}. \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 specified category for the given language. diff --git a/include/wx/mac/corefoundation/stdpaths.h b/include/wx/mac/corefoundation/stdpaths.h index b35694be2f..3fcb8d5676 100644 --- a/include/wx/mac/corefoundation/stdpaths.h +++ b/include/wx/mac/corefoundation/stdpaths.h @@ -42,7 +42,7 @@ public: virtual wxString GetPluginsDir() const; virtual wxString GetResourcesDir() const; virtual wxString - GetLocalizedResourcesDir(const wxChar *lang, + GetLocalizedResourcesDir(const wxString& lang, ResourceCat category = ResourceCat_None) const; virtual wxString GetDocumentsDir() const; diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h index 7828b69e62..ca16733fe8 100644 --- a/include/wx/stdpaths.h +++ b/include/wx/stdpaths.h @@ -109,7 +109,7 @@ public: // different under Unix for message catalog category (namely the standard // prefix/share/locale/lang/LC_MESSAGES) virtual wxString - GetLocalizedResourcesDir(const wxChar *lang, + GetLocalizedResourcesDir(const wxString& lang, ResourceCat WXUNUSED(category) = ResourceCat_None) const { diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h index ed37b43ae4..f5301dbbff 100644 --- a/include/wx/unix/stdpaths.h +++ b/include/wx/unix/stdpaths.h @@ -45,7 +45,7 @@ public: virtual wxString GetLocalDataDir() const; virtual wxString GetUserDataDir() const; virtual wxString GetPluginsDir() const; - virtual wxString GetLocalizedResourcesDir(const wxChar *lang, + virtual wxString GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const; private: diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp index 925d220ecf..f8cf48355a 100644 --- a/src/mac/corefoundation/stdpaths_cf.cpp +++ b/src/mac/corefoundation/stdpaths_cf.cpp @@ -201,7 +201,7 @@ wxString wxStandardPathsCF::GetResourcesDir() const } wxString -wxStandardPathsCF::GetLocalizedResourcesDir(const wxChar *lang, +wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { return wxStandardPathsBase:: diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp index e81f673d20..af3551bf06 100644 --- a/src/unix/stdpaths.cpp +++ b/src/unix/stdpaths.cpp @@ -94,7 +94,7 @@ wxString wxStandardPaths::GetPluginsDir() const } wxString -wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, +wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category); @@ -206,7 +206,7 @@ wxString wxStandardPaths::GetPluginsDir() const } wxString -wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang, +wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang, ResourceCat category) const { if ( category != ResourceCat_Messages ) -- 2.47.2