From: Francesco Montorsi Date: Sat, 22 Nov 2008 10:41:52 +0000 (+0000) Subject: few other fixes for wxChar => wxString X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/920b92a3fd568f012a8f7814d56640cb729ba993 few other fixes for wxChar => wxString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/interface/wx/cmdline.h b/interface/wx/cmdline.h index 0136d2d9ad..69bf1d439d 100644 --- a/interface/wx/cmdline.h +++ b/interface/wx/cmdline.h @@ -322,7 +322,7 @@ public: backslash can be used to escape all the other special characters. */ static wxArrayString - ConvertStringToArgs(const wxChar cmdline, + ConvertStringToArgs(const wxString& cmdline, wxCmdLineSplitType flags = wxCMD_LINE_SPLIT_DOS); /** diff --git a/interface/wx/filename.h b/interface/wx/filename.h index 4917fecce9..ffaabdd23f 100644 --- a/interface/wx/filename.h +++ b/interface/wx/filename.h @@ -546,7 +546,7 @@ public: @see GetPathSeparators() */ - static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE); + static wxUniChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE); /** Returns the string containing all the path separators for this format. diff --git a/interface/wx/msw/registry.h b/interface/wx/msw/registry.h index 2a1f149ef7..28c287e3f0 100644 --- a/interface/wx/msw/registry.h +++ b/interface/wx/msw/registry.h @@ -105,7 +105,7 @@ public: /** Deletes the subkey with all of its subkeys/values recursively. */ - void DeleteKey(const wxChar* szKey); + void DeleteKey(const wxString& szKey); /** Deletes this key and all of its subkeys and values recursively. @@ -115,7 +115,7 @@ public: /** Deletes the named value. */ - void DeleteValue(const wxChar* szKey); + void DeleteValue(const wxString& szKey); /** Returns @true if the key exists. @@ -165,7 +165,7 @@ public: /** Returns @true if given subkey exists. */ - bool HasSubKey(const wxChar* szKey) const; + bool HasSubKey(const wxString& szKey) const; /** Returns @true if any subkeys exist. @@ -175,7 +175,7 @@ public: /** Returns @true if the value exists. */ - bool HasValue(const wxChar* szValue) const; + bool HasValue(const wxString& szValue) const; /** Returns @true if any values exist. @@ -202,37 +202,37 @@ public: /** Retrieves the string value. */ - bool QueryValue(const wxChar* szValue, wxString& strValue) const; + bool QueryValue(const wxString& szValue, wxString& strValue) const; /** Retrieves the numeric value. */ - const bool QueryValue(const wxChar* szValue, long* plValue) const; + const bool QueryValue(const wxString& szValue, long* plValue) const; /** Renames the key. */ - bool Rename(const wxChar* szNewName); + bool Rename(const wxString& szNewName); /** Renames a value. */ - bool RenameValue(const wxChar* szValueOld, - const wxChar* szValueNew); + bool RenameValue(const wxString& szValueOld, + const wxString& szValueNew); /** Sets the given @a szValue which must be numeric. If the value doesn't exist, it is created. */ - bool SetValue(const wxChar* szValue, long lValue); + bool SetValue(const wxString& szValue, long lValue); /** Sets the given @a szValue which must be string. If the value doesn't exist, it is created. */ - bool SetValue(const wxChar* szValue, const wxString& strValue); + bool SetValue(const wxString& szValue, const wxString& strValue); /** Sets the given @a szValue which must be binary. If the value doesn't exist, it is created. */ - bool SetValue(const wxChar* szValue, const wxMemoryBuffer& buf); + bool SetValue(const wxString& szValue, const wxMemoryBuffer& buf); };