* Changed char to wxChar in operators.

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 3a951f26335534bdd9c48f7401fbb24ab1da2cba..2fc0ac7aa7d404628ccca16daf897e3ed6db4edd 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -33,10 +33,9 @@ public:
 
   // Operators
   wxTextInputStream& operator>>(wxString& line);
 
   // Operators
   wxTextInputStream& operator>>(wxString& line);

-  wxTextInputStream& operator>>(wxInt8& c);
+  wxTextInputStream& operator>>(wxChar& c);

   wxTextInputStream& operator>>(wxInt16& i);
   wxTextInputStream& operator>>(wxInt32& i);
   wxTextInputStream& operator>>(wxInt16& i);
   wxTextInputStream& operator>>(wxInt32& i);

-  wxTextInputStream& operator>>(wxUint8& c);

   wxTextInputStream& operator>>(wxUint16& i);
   wxTextInputStream& operator>>(wxUint32& i);
   wxTextInputStream& operator>>(double& i);
   wxTextInputStream& operator>>(wxUint16& i);
   wxTextInputStream& operator>>(wxUint32& i);
   wxTextInputStream& operator>>(double& i);


@@ -59,10 +58,9 @@ class WXDLLEXPORT wxTextOutputStream {
 
   wxTextOutputStream& operator<<(const wxChar *string);
   wxTextOutputStream& operator<<(const wxString& string);
 
   wxTextOutputStream& operator<<(const wxChar *string);
   wxTextOutputStream& operator<<(const wxString& string);

-  wxTextOutputStream& operator<<(wxInt8 c);
+  wxTextOutputStream& operator<<(wxChar c);

   wxTextOutputStream& operator<<(wxInt16 c);
   wxTextOutputStream& operator<<(wxInt32 c);
   wxTextOutputStream& operator<<(wxInt16 c);
   wxTextOutputStream& operator<<(wxInt32 c);

-  wxTextOutputStream& operator<<(wxUint8 c);

   wxTextOutputStream& operator<<(wxUint16 c);
   wxTextOutputStream& operator<<(wxUint32 c);
   wxTextOutputStream& operator<<(double f);
   wxTextOutputStream& operator<<(wxUint16 c);
   wxTextOutputStream& operator<<(wxUint32 c);
   wxTextOutputStream& operator<<(double f);

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 4a0695da0329dc710310b150ba8210eea954ead6..6475674cb0c2266032e314a4d0759f62e3a037c8 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -189,9 +189,12 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
   return *this;
 }
 
   return *this;
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(char& c)
+wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)

 {
 {

-  m_input->Read(&c, 1);
+  // TODO
+/*
+  m_input->Read(&c, sizeof(wxChar));
+*/

   return *this;
 }
 
   return *this;
 }
 


@@ -294,9 +297,11 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
   return *this;
 }
 
   return *this;
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(char c)
+wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)

 {
 {

-  m_output->Write(&c, 1);
+  wxString tmp_str;
+  tmp_str.Printf("%c", c);
+  WriteString(tmp_str);

   return *this;
 }
 
   return *this;
 }