take wxString, not wxChar* in wxStandardPaths::GetLocalizedResourcesDir

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/stdpaths.tex b/docs/latex/wx/stdpaths.tex
index ff39c09ebf4e2b83de368d3c1ecf9ef572e478e9..6223e840b4aa372e82f130b6bb8198db6807253d 100644 (file)
--- 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}
 
 
 \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.
 
 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 b35694be2fa707406976e07a99210c2c6248998a..3fcb8d5676beca3ffefe77773e93d225a857d867 100644 (file)
--- 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
     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;
 
                              ResourceCat category = ResourceCat_None) const;
     virtual wxString GetDocumentsDir() const;
 

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 7828b69e625c77eb35b13a81ac0bb73bee493ded..ca16733fe8d7f438230485e6d7045c395e0e3635 100644 (file)
--- 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
     // 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
     {
                              ResourceCat WXUNUSED(category)
                                 = ResourceCat_None) const
     {

diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h
index ed37b43ae456f73e4a449b83605a0dd10485cd78..f5301dbbffbe68685827e18c3a0d44b23d540525 100644 (file)
--- 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 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:
                                               ResourceCat category) const;
 
 private:

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index 925d220ecffb3e2e1342000bccc2be7cd2c5a25d..f8cf48355a0e118d378c02458134914f4698ab48 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -201,7 +201,7 @@ wxString wxStandardPathsCF::GetResourcesDir() const
 }
 
 wxString
 }
 
 wxString

-wxStandardPathsCF::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,

                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::

diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index e81f673d205d792e4cf75ab64d8eb1dba17683b1..af3551bf068b51546d3f765c7d64491d0e6693a1 100644 (file)
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -94,7 +94,7 @@ wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString
 }
 
 wxString

-wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
+wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,

                                           ResourceCat category) const
 {
     return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
                                           ResourceCat category) const
 {
     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
 {
     if ( category != ResourceCat_Messages )
                                           ResourceCat category) const
 {
     if ( category != ResourceCat_Messages )