Changed char to wxChar.

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 8626389114eaa40922fc314910759bf7157dc49d..10a8fa896e5cdc168b5f19419f88330d33aecc80 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -222,13 +222,13 @@ public:
     inline operator wxString () const {  return MakeString(); }
     wxString GetString() const;
 
-    // char (wxChar?)
-    wxVariant(char val, const wxString& name = wxEmptyString);
-    bool operator== (char value) const;
-    bool operator!= (char value) const;
-    void operator= (char value) ;
-    inline operator char () const { return GetChar(); }
-    char GetChar() const ;
+    // wxChar
+    wxVariant(wxChar val, const wxString& name = wxEmptyString);
+    bool operator== (wxChar value) const;
+    bool operator!= (wxChar value) const;
+    void operator= (wxChar value) ;
+    inline operator wxChar () const { return GetChar(); }
+    wxChar GetChar() const ;
     
     // wxArrayString
     wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString);

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 37dc2c3f419122c707901cefece2391df1b86f6d..63584d8d396ce114021393672d05f86282b6f061 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -642,10 +642,10 @@ class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
     wxVariantDataChar() { m_value = 0; }
-    wxVariantDataChar(char value) { m_value = value; }
+    wxVariantDataChar(wxChar value) { m_value = value; }
 
-    inline char GetValue() const { return m_value; }
-    inline void SetValue(char value) { m_value = value; }
+    inline wxChar GetValue() const { return m_value; }
+    inline void SetValue(wxChar value) { m_value = value; }
 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
@@ -661,7 +661,7 @@ public:
     virtual wxString GetType() const { return wxT("char"); };
 
 protected:
-    char m_value;
+    wxChar m_value;
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
@@ -695,7 +695,7 @@ bool wxVariantDataChar::Write(wxString& str) const
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
-//    str >> m_value;
+    
     return false;
 }
 #endif
@@ -713,24 +713,25 @@ bool wxVariantDataChar::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
-    m_value = s.Read8();
+    s >> m_value;
+
     return true;
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
-    m_value = str.ToAscii()[size_t(0)];
+    m_value = str[size_t(0)];
     return true;
 }
 
-wxVariant::wxVariant(char val, const wxString& name)
+wxVariant::wxVariant(wxChar val, const wxString& name)
 {
     m_data = new wxVariantDataChar(val);
     m_name = name;
 }
 
-bool wxVariant::operator== (char value) const
+bool wxVariant::operator== (wxChar value) const
 {
     char thisValue;
     if (!Convert(&thisValue))
@@ -739,12 +740,12 @@ bool wxVariant::operator== (char value) const
         return (value == thisValue);
 }
 
-bool wxVariant::operator!= (char value) const
+bool wxVariant::operator!= (wxChar value) const
 {
     return (!((*this) == value));
 }
 
-void wxVariant::operator= (char value)
+void wxVariant::operator= (wxChar value)
 {
     if (GetType() == wxT("char") &&
         m_data->GetRefCount() == 1)
@@ -758,7 +759,7 @@ void wxVariant::operator= (char value)
     }
 }
 
-char wxVariant::GetChar() const
+wxChar wxVariant::GetChar() const
 {
     char value;
     if (Convert(& value))