add wxUSE_BASE64 checks around DoRead/WriteBinary() functions

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index c6dd81ff317c65fae1badcbc06e2aeba12187c71..43deb545d3d419d5daf69951d3c58b8b145e9194 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.cpp
+// Name:        src/common/txtstrm.cpp

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


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


@@ -35,8 +39,10 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE

-wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
-  : m_input(s), m_separators(sep), m_conv(conv)
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())

 {
     memset((void*)m_lastBytes, 0, 10);
 }
 {
     memset((void*)m_lastBytes, 0, 10);
 }


@@ -50,6 +56,9 @@ wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextInputStream::UngetLast()
 }
 
 void wxTextInputStream::UngetLast()


@@ -74,8 +83,8 @@ wxChar wxTextInputStream::NextChar()
         if(m_input.LastRead() <= 0)
             return wxEOT;
 
         if(m_input.LastRead() <= 0)
             return wxEOT;
 

-        int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
-        if(retlen >= 0) // res == 0 could happen for '\0' char
+        if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
+                != wxCONV_FAILED )

             return wbuf[0];
     }
     // there should be no encoding which requires more than nine bytes for one character...
             return wbuf[0];
     }
     // there should be no encoding which requires more than nine bytes for one character...


@@ -173,11 +182,15 @@ double wxTextInputStream::ReadDouble()
     return wxStrtod(word.c_str(), 0);
 }
 
     return wxStrtod(word.c_str(), 0);
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;


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

-        if ( !m_input )
-            break;
-

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


@@ -298,8 +308,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
 
 
 #if wxUSE_UNICODE
 
 
 #if wxUSE_UNICODE

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
-  : m_output(s), m_conv(conv)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())

 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)


@@ -320,6 +332,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 
 wxTextOutputStream::~wxTextOutputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)
 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)


@@ -348,7 +363,7 @@ void wxTextOutputStream::Write32(wxUint32 i)
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -356,7 +371,7 @@ void wxTextOutputStream::Write16(wxUint16 i)
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -404,10 +419,10 @@ void wxTextOutputStream::WriteString(const wxString& string)
         out << c;
     }
 
         out << c;
     }
 

-    // We must not write the trailing NULL here

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxCharBuffer buffer = m_conv.cWC2MB( out );
-    m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+    // 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() );
 #endif
 #else
     m_output.Write(out.c_str(), out.length() );
 #endif


@@ -416,19 +431,13 @@ void wxTextOutputStream::WriteString(const wxString& string)
 wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
 {
 #if wxUSE_UNICODE
 wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
 {
 #if wxUSE_UNICODE

-    WriteString( wxString(&c, m_conv, 1) );
+    WriteString( wxString(&c, *m_conv, 1) );

 #else
     WriteString( wxString(&c, wxConvLocal, 1) );
 #endif
     return *this;
 }
 
 #else
     WriteString( wxString(&c, wxConvLocal, 1) );
 #endif
     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 );


@@ -446,7 +455,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {

-    WriteString( wxString(&wc, m_conv, 1) );
+    WriteString( wxString(&wc, *m_conv, 1) );

 
     return *this;
 }
 
     return *this;
 }