no real changes, just refactor to remove some code duplication in wxToolBarTool

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 010fe739f644263c97a91860e9882bd59c6e2c86..f7d6c09efd66d542d993168acdf42736f69146e0 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,22 +18,14 @@
 
 #if wxUSE_STREAMS
 
+#include "wx/txtstrm.h"
+
 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 #endif
 
-#include "wx/txtstrm.h"
 #include <ctype.h>
 
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
-
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
@@ -77,9 +69,6 @@ wxChar wxTextInputStream::NextChar()
     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();
 
@@ -93,9 +82,6 @@ wxChar wxTextInputStream::NextChar()
     // 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)
@@ -115,7 +101,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)
           return c;
     }
 
@@ -235,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))
@@ -328,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
@@ -350,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
@@ -444,6 +426,19 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
     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 );