X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..ee682a94cb9ea835c9b74a12f17b0fb63f43dcce:/src/common/txtstrm.cpp?ds=inline

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 8fd6ffaaaf..62f2e5f72c 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -38,10 +38,17 @@
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv)
+{
+}
+#else
 wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
   : m_input(s), m_separators(sep)
 {
 }
+#endif
 
 wxTextInputStream::~wxTextInputStream()
 {
@@ -234,12 +241,23 @@ wxString wxTextInputStream::ReadString()
 
 wxString wxTextInputStream::ReadLine()
 {
-    wxChar c;
     wxString line;
 
     while ( !m_input.Eof() )
     {
-        c = m_input.GetC();
+#if wxUSE_UNICODE
+        // FIXME: this is only works for single byte encodings
+        // How-to read a single char in an unkown encoding???
+        char buf[10];
+        buf[0] = m_input.GetC();
+        buf[1] = 0;
+        
+        wxChar wbuf[2];
+        m_conv.MB2WC( wbuf, buf, 2 );
+        wxChar c = wbuf[0];
+#else
+        char c = m_input.GetC();
+#endif
         
         if ( !m_input )
             break;
@@ -343,15 +361,22 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
     return *this;
 }
 
+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
+  : m_output(s), m_conv(conv)
+#else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
+#endif
 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
@@ -370,7 +395,7 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
@@ -412,33 +437,46 @@ void wxTextOutputStream::WriteDouble(double d)
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {
-    for (size_t i = 0; i < string.Len(); i++)
+    size_t len = string.length();
+
+    wxString out;
+    out.reserve(len);
+
+    for ( size_t i = 0; i < len; i++ )
     {
-        wxChar c = string[i];
-        if (c == wxT('\n'))
+        const wxChar c = string[i];
+        if ( c == wxT('\n') )
         {
-            if (m_mode == wxEOL_DOS)
+            switch ( m_mode )
             {
-                 c = wxT('\r');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-                 c = wxT('\n');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-            } else
-            if (m_mode == wxEOL_MAC)
-            {
-                 c = wxT('\r');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-            } else
-            {
-                 c = wxT('\n');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
+                case wxEOL_DOS:
+                    out << _T("\r\n");
+                    continue;
+
+                case wxEOL_MAC:
+                    out << _T('\r');
+                    continue;
+
+                default:
+                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    // fall through
+
+                case wxEOL_UNIX:
+                    // don't treat '\n' specially
+                    ;
             }
         }
-        else
-        {
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-        }
+
+        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 ) );
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
@@ -455,12 +493,8 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
-    // these strange manipulations are needed in Unicode mode
-    char buf[2];
-    buf[0] = c;
-    buf[1] = 0;
-
-    WriteString( wxString(buf) );
+    WriteString( wxString::FromAscii(c) );
+    
     return *this;
 }