Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index c6dd81ff317c65fae1badcbc06e2aeba12187c71..f7d6c09efd66d542d993168acdf42736f69146e0 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:
@@ -19,24 +19,22 @@
 #if wxUSE_STREAMS
 
 #include "wx/txtstrm.h"
-#include <ctype.h>
-
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
 
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
+#include <ctype.h>
 
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 #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);
 }
@@ -50,6 +48,9 @@ wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
 
 wxTextInputStream::~wxTextInputStream()
 {
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
 }
 
 void wxTextInputStream::UngetLast()
@@ -74,8 +75,8 @@ wxChar wxTextInputStream::NextChar()
         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...
@@ -100,7 +101,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)
           return c;
     }
 
@@ -173,11 +174,15 @@ double wxTextInputStream::ReadDouble()
     return wxStrtod(word.c_str(), 0);
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
+#endif // WXWIN_COMPATIBILITY_2_6
+
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
@@ -188,9 +193,6 @@ wxString wxTextInputStream::ReadLine()
         if(c == wxEOT)
             break;
 
-        if ( !m_input )
-            break;
-
         if (EatEOL(c))
             break;
 
@@ -219,7 +221,7 @@ wxString wxTextInputStream::ReadWord()
         if(c == wxEOT)
             break;
 
-        if (m_separators.Contains(c))
+        if (m_separators.Find(c) >= 0)
             break;
 
         if (EatEOL(c))
@@ -298,8 +300,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
 
 
 #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)
@@ -310,8 +314,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
 #endif
@@ -320,6 +322,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
 
 wxTextOutputStream::~wxTextOutputStream()
 {
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)
@@ -329,8 +334,6 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
 #endif
@@ -348,7 +351,7 @@ void wxTextOutputStream::Write32(wxUint32 i)
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);
 
     WriteString(str);
 }
@@ -356,7 +359,7 @@ void wxTextOutputStream::Write16(wxUint16 i)
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);
 
     WriteString(str);
 }
@@ -404,10 +407,10 @@ void wxTextOutputStream::WriteString(const wxString& string)
         out << c;
     }
 
-    // We must not write the trailing NULL here
 #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
@@ -416,17 +419,24 @@ void wxTextOutputStream::WriteString(const wxString& string)
 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;
 }
 
-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
+void wxTextOutputStream::Flush()
 {
-    WriteString( wxString(string) );
-    return *this;
+#if wxUSE_UNICODE
+    const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
+    if ( len > m_conv->GetMBNulLen() )
+    {
+        wxCharBuffer buf(len);
+        m_conv->FromWChar(buf.data(), len, L"", 1);
+        m_output.Write(buf, len - m_conv->GetMBNulLen());
+    }
+#endif // wxUSE_UNICODE
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
@@ -446,7 +456,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {
-    WriteString( wxString(&wc, m_conv, 1) );
+    WriteString( wxString(&wc, *m_conv, 1) );
 
     return *this;
 }