include wxchar.h from string.h in 2.8 compatibility mode to prevent lots of compilati...

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

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index d8011a8e499cd3ede1f2a54e65b35e36a6365b20..248af2453a6191c891b8fb315b4ce8c0d83a6f33 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        txtstrm.h
+// Name:        wx/txtstrm.h
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -52,7 +52,6 @@ public:
     wxInt16  Read16S(int base = 10);
     wxInt8   Read8S(int base = 10);
     double   ReadDouble();
-    wxString ReadString();  // deprecated: use ReadLine or ReadWord instead
     wxString ReadLine();
     wxString ReadWord();
     wxChar   GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); }
@@ -75,13 +74,17 @@ public:
 
     wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
 
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( wxString ReadString() );  // use ReadLine or ReadWord instead
+#endif // WXWIN_COMPATIBILITY_2_6
+
 protected:
     wxInputStream &m_input;
     wxString m_separators;
     char m_lastBytes[10]; // stores the bytes that were read for the last character
 
 #if wxUSE_UNICODE
-    wxMBConv m_conv;
+    wxMBConv *m_conv;
 #endif
 
     bool   EatEOL(const wxChar &c);
@@ -144,7 +147,7 @@ protected:
     wxEOL           m_mode;
 
 #if wxUSE_UNICODE
-    wxMBConv m_conv;
+    wxMBConv *m_conv;
 #endif
 
     DECLARE_NO_COPY_CLASS(wxTextOutputStream)