converted to 16 colors

[wxWidgets.git] / include / wx / txtstrm.h

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 3a951f26335534bdd9c48f7401fbb24ab1da2cba..5586707252757cb9db3710b522ad2c9004b55f1e 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);


@@ -44,6 +43,9 @@ public:
 
  protected:
   wxInputStream *m_input;
 
  protected:
   wxInputStream *m_input;

+  
+  wxChar NextNonWhiteSpace();
+  void SkipIfEndOfLine( wxChar c );

 };
 
 class WXDLLEXPORT wxTextOutputStream {
 };
 
 class WXDLLEXPORT wxTextOutputStream {


@@ -56,13 +58,12 @@ class WXDLLEXPORT wxTextOutputStream {
   void Write8(wxUint8 i);
   void WriteDouble(double d);
   void WriteString(const wxString& string);
   void Write8(wxUint8 i);
   void WriteDouble(double d);
   void WriteString(const wxString& string);

-
+  

   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);