Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Changed char to wxChar in operators.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-07-13 06:27:42 +00:00
parent b1830dfaba
commit 940ddb190c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/txtstrm.h
View File

@@ -33,10 +33,9 @@ public:
// Operators // Operators
wxTextInputStream& operator>>(wxString& line); wxTextInputStream& operator>>(wxString& line);
wxTextInputStream& operator>>(wxInt8& c); wxTextInputStream& operator>>(wxChar& c);
wxTextInputStream& operator>>(wxInt16& i); wxTextInputStream& operator>>(wxInt16& i);
wxTextInputStream& operator>>(wxInt32& i); wxTextInputStream& operator>>(wxInt32& i);
wxTextInputStream& operator>>(wxUint8& c);
wxTextInputStream& operator>>(wxUint16& i); wxTextInputStream& operator>>(wxUint16& i);
wxTextInputStream& operator>>(wxUint32& i); wxTextInputStream& operator>>(wxUint32& i);
wxTextInputStream& operator>>(double& i); wxTextInputStream& operator>>(double& i);
@@ -59,10 +58,9 @@ class WXDLLEXPORT wxTextOutputStream {
wxTextOutputStream& operator<<(const wxChar *string); wxTextOutputStream& operator<<(const wxChar *string);
wxTextOutputStream& operator<<(const wxString& string); wxTextOutputStream& operator<<(const wxString& string);
wxTextOutputStream& operator<<(wxInt8 c); wxTextOutputStream& operator<<(wxChar c);
wxTextOutputStream& operator<<(wxInt16 c); wxTextOutputStream& operator<<(wxInt16 c);
wxTextOutputStream& operator<<(wxInt32 c); wxTextOutputStream& operator<<(wxInt32 c);
wxTextOutputStream& operator<<(wxUint8 c);
wxTextOutputStream& operator<<(wxUint16 c); wxTextOutputStream& operator<<(wxUint16 c);
wxTextOutputStream& operator<<(wxUint32 c); wxTextOutputStream& operator<<(wxUint32 c);
wxTextOutputStream& operator<<(double f); wxTextOutputStream& operator<<(double f);

13
src/common/txtstrm.cpp
View File

@@ -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;
} }