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 4792c10cce76b6e9221dafc9fe54ffafe9e0b1ed..f7d6c09efd66d542d993168acdf42736f69146e0 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,22 +18,14 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

+#include "wx/txtstrm.h"
+

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

-#include "wx/txtstrm.h"

 #include <ctype.h>
 
 #include <ctype.h>
 

-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
-

 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------


@@ -109,7 +101,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&

-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)

           return c;
     }
 
           return c;
     }
 


@@ -229,7 +221,7 @@ wxString wxTextInputStream::ReadWord()
         if(c == wxEOT)
             break;
 
         if(c == wxEOT)
             break;
 

-        if (m_separators.Contains(c))
+        if (m_separators.Find(c) >= 0)

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


@@ -434,6 +426,19 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
     return *this;
 }
 
     return *this;
 }
 

+void wxTextOutputStream::Flush()
+{
+#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)
 {
     WriteString( string );
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );