rename various gsock* files to sock* (except for MSW where this will be done later)

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index d2e08f5c8ffbe5f53cb707397a82af18739c7059..f7d6c09efd66d542d993168acdf42736f69146e0 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -19,16 +19,12 @@
 #if wxUSE_STREAMS
 
 #include "wx/txtstrm.h"
 #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
 
 // ----------------------------------------------------------------------------
 // wxTextInputStream


@@ -105,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;
     }
 


@@ -225,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))


@@ -318,8 +314,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -340,8 +334,6 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -416,7 +408,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() );


@@ -433,10 +426,17 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
     return *this;
 }
 
     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)
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)