add wxDataViewIconText

[wxWidgets.git] / src / common / txtstrm.cpp

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 1894757f21cecb6385f56712ecc4bd9ddd6d3975..010fe739f644263c97a91860e9882bd59c6e2c86 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,6 +18,10 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+

 #include "wx/txtstrm.h"
 #include <ctype.h>
 
 #include "wx/txtstrm.h"
 #include <ctype.h>
 


@@ -73,6 +77,9 @@ wxChar wxTextInputStream::NextChar()
     memset((void*)m_lastBytes, 0, 10);
     for(size_t inlen = 0; inlen < 9; inlen++)
     {
     memset((void*)m_lastBytes, 0, 10);
     for(size_t inlen = 0; inlen < 9; inlen++)
     {

+        if (!m_input.CanRead())
+            return wxEOT;
+

         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 


@@ -86,6 +93,9 @@ wxChar wxTextInputStream::NextChar()
     // there should be no encoding which requires more than nine bytes for one character...
     return wxEOT;
 #else
     // there should be no encoding which requires more than nine bytes for one character...
     return wxEOT;
 #else

+    if (!m_input.CanRead())
+        return wxEOT;
+

     m_lastBytes[0] = m_input.GetC();
 
     if(m_input.LastRead() <= 0)
     m_lastBytes[0] = m_input.GetC();
 
     if(m_input.LastRead() <= 0)


@@ -197,9 +207,6 @@ wxString wxTextInputStream::ReadLine()
         if(c == wxEOT)
             break;
 
         if(c == wxEOT)
             break;
 

-        if ( !m_input )
-            break;
-

         if (EatEOL(c))
             break;
 
         if (EatEOL(c))
             break;
 


@@ -419,7 +426,8 @@ void wxTextOutputStream::WriteString(const wxString& string)
     }
 
 #if wxUSE_UNICODE
     }
 
 #if wxUSE_UNICODE

-    wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
+    // FIXME-UTF8: use wxCharBufferWithLength if/when we have it
+    wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len);

     m_output.Write(buffer, len);
 #else
     m_output.Write(out.c_str(), out.length() );
     m_output.Write(buffer, len);
 #else
     m_output.Write(out.c_str(), out.length() );


@@ -436,12 +444,6 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
     return *this;
 }
 
     return *this;
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
-{
-    WriteString( wxString(string) );
-    return *this;
-}
-

 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );