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 0136d2d9ad97469b45354383370623acee2cbc43..69bf1d439d91ab687a9bc0b8944277f0af109c7a 100644 (file)
--- 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
         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);
 
     /**
                         wxCmdLineSplitType flags = wxCMD_LINE_SPLIT_DOS);
 
     /**

diff --git a/interface/wx/filename.h b/interface/wx/filename.h
index 4917fecce97ad7924390a669b28d8126669ef913..ffaabdd23f5ba4c0e6e7b5abc5b696d869d4a701 100644 (file)
--- a/interface/wx/filename.h
+++ b/interface/wx/filename.h
@@ -546,7 +546,7 @@ public:
 
         @see GetPathSeparators()
     */
 
         @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.
 
     /**
         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 2a1f149ef7dfc470be11050c6cae0369184b63dd..28c287e3f00e589e85e3cc02180420100d013033 100644 (file)
--- 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.
     */
     /**
         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.
 
     /**
         Deletes this key and all of its subkeys and values recursively.


@@ -115,7 +115,7 @@ public:
     /**
         Deletes the named value.
     */
     /**
         Deletes the named value.
     */

-    void DeleteValue(const wxChar* szKey);
+    void DeleteValue(const wxString& szKey);

 
     /**
         Returns @true if the key exists.
 
     /**
         Returns @true if the key exists.


@@ -165,7 +165,7 @@ public:
     /**
         Returns @true if given subkey exists.
     */
     /**
         Returns @true if given subkey exists.
     */

-    bool HasSubKey(const wxChar* szKey) const;
+    bool HasSubKey(const wxString& szKey) const;

 
     /**
         Returns @true if any subkeys exist.
 
     /**
         Returns @true if any subkeys exist.


@@ -175,7 +175,7 @@ public:
     /**
         Returns @true if the value exists.
     */
     /**
         Returns @true if the value exists.
     */

-    bool HasValue(const wxChar* szValue) const;
+    bool HasValue(const wxString& szValue) const;

 
     /**
         Returns @true if any values exist.
 
     /**
         Returns @true if any values exist.


@@ -202,37 +202,37 @@ public:
     /**
         Retrieves the string value.
     */
     /**
         Retrieves the string value.
     */

-    bool QueryValue(const wxChar* szValue, wxString& strValue) const;
+    bool QueryValue(const wxString& szValue, wxString& strValue) const;

 
     /**
         Retrieves the numeric value.
     */
 
     /**
         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.
     */
 
     /**
         Renames the key.
     */

-    bool Rename(const wxChar* szNewName);
+    bool Rename(const wxString& szNewName);

 
     /**
         Renames a value.
     */
 
     /**
         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.
     */
 
     /**
         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.
     */
     /**
         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.
     */
     /**
         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);

 };
 };