Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 1ac783c88f2f80b276630860525e80b6e3e247a5..7ae75f5b7621efcc9e626991272e81c7e43d3951 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:
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -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


@@ -79,11 +75,35 @@ wxChar wxTextInputStream::NextChar()
         if(m_input.LastRead() <= 0)
             return wxEOT;
 
         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
-            return wbuf[0];
+        switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+        {
+            case 0:
+                // this is a bug in converter object as it should either fail
+                // or decode non-empty string to something non-empty
+                wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+                break;
+
+            case wxCONV_FAILED:
+                // the buffer probably doesn't contain enough bytes to decode
+                // as a complete character, try with more bytes
+                break;
+
+            default:
+                // if we couldn't decode a single character during the last
+                // loop iteration we shouldn't be able to decode 2 or more of
+                // them with an extra single byte, something fishy is going on
+                wxFAIL_MSG("unexpected decoding result");
+                // fall through nevertheless and return at least something
+
+            case 1:
+                // we finally decoded a character
+                return wbuf[0];
+        }

     }
     }

-    // there should be no encoding which requires more than nine bytes for one character...
+
+    // there should be no encoding which requires more than nine bytes for one
+    // character so something must be wrong with our conversion but we have no
+    // way to signal it from here

     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();
     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();


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


@@ -129,7 +149,7 @@ bool wxTextInputStream::EatEOL(const wxChar &c)
 
 wxUint32 wxTextInputStream::Read32(int base)
 {
 
 wxUint32 wxTextInputStream::Read32(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();


@@ -150,7 +170,7 @@ wxUint8 wxTextInputStream::Read8(int base)
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();


@@ -178,11 +198,15 @@ double wxTextInputStream::ReadDouble()
     return wxStrtod(word.c_str(), 0);
 }
 
     return wxStrtod(word.c_str(), 0);
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;


@@ -193,9 +217,6 @@ wxString wxTextInputStream::ReadLine()
         if(c == wxEOT)
             break;
 
         if(c == wxEOT)
             break;
 

-        if ( !m_input )
-            break;
-

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


@@ -224,7 +245,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))


@@ -315,10 +336,8 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)

         m_mode = wxEOL_DOS;
         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


@@ -337,10 +356,8 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)

         m_mode = wxEOL_DOS;
         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


@@ -394,15 +411,15 @@ void wxTextOutputStream::WriteString(const wxString& string)
             switch ( m_mode )
             {
                 case wxEOL_DOS:
             switch ( m_mode )
             {
                 case wxEOL_DOS:

-                    out << _T("\r\n");
+                    out << wxT("\r\n");

                     continue;
 
                 case wxEOL_MAC:
                     continue;
 
                 case wxEOL_MAC:

-                    out << _T('\r');
+                    out << wxT('\r');

                     continue;
 
                 default:
                     continue;
 
                 default:

-                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );

                     // fall through
 
                 case wxEOL_UNIX:
                     // fall through
 
                 case wxEOL_UNIX:


@@ -414,10 +431,10 @@ void wxTextOutputStream::WriteString(const wxString& string)
         out << c;
     }
 
         out << c;
     }
 

-    // We must not write the trailing NULL here

 #if wxUSE_UNICODE
 #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
 #else
     m_output.Write(out.c_str(), out.length() );
 #endif


@@ -433,10 +450,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)