centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 3fc683abd6c15c71a61c2acb69add78a0793c336..1894757f21cecb6385f56712ecc4bd9ddd6d3975 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:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "txtstrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -39,8 +35,10 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE

-wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
-  : m_input(s), m_separators(sep), m_conv(conv)
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())

 {
     memset((void*)m_lastBytes, 0, 10);
 }
 {
     memset((void*)m_lastBytes, 0, 10);
 }


@@ -54,6 +52,9 @@ wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextInputStream::UngetLast()
 }
 
 void wxTextInputStream::UngetLast()


@@ -78,8 +79,8 @@ 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
+        if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
+                != wxCONV_FAILED )

             return wbuf[0];
     }
     // there should be no encoding which requires more than nine bytes for one character...
             return wbuf[0];
     }
     // there should be no encoding which requires more than nine bytes for one character...


@@ -132,7 +133,7 @@ wxUint32 wxTextInputStream::Read32(int base)
     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtoul(word.c_str(), 0, base);
 }
         return 0;
     return wxStrtoul(word.c_str(), 0, base);
 }


@@ -153,7 +154,7 @@ wxInt32 wxTextInputStream::Read32S(int base)
     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtol(word.c_str(), 0, base);
 }
         return 0;
     return wxStrtol(word.c_str(), 0, base);
 }


@@ -172,16 +173,20 @@ double wxTextInputStream::ReadDouble()
 {
     if(!m_input) return 0;
     wxString word = ReadWord();
 {
     if(!m_input) return 0;
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtod(word.c_str(), 0);
 }
 
         return 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;


@@ -252,6 +257,17 @@ wxTextInputStream& wxTextInputStream::operator>>(char& c)
     return *this;
 }
 
     return *this;
 }
 

+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)
+{
+    wc = GetChar();
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+

 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();
 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();


@@ -291,8 +307,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
 
 
 #if wxUSE_UNICODE
 
 
 #if wxUSE_UNICODE

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
-  : m_output(s), m_conv(conv)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())

 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)


@@ -313,6 +331,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 
 wxTextOutputStream::~wxTextOutputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)
 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)


@@ -341,7 +362,7 @@ void wxTextOutputStream::Write32(wxUint32 i)
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -349,7 +370,7 @@ void wxTextOutputStream::Write16(wxUint16 i)
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -395,17 +416,26 @@ 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 ) );
+    wxCharBuffer buffer = m_conv->cWC2MB(out, 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
 }
 

+wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
+{
+#if wxUSE_UNICODE
+    WriteString( wxString(&c, *m_conv, 1) );
+#else
+    WriteString( wxString(&c, wxConvLocal, 1) );
+#endif
+    return *this;
+}
+

 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
 {
     WriteString( wxString(string) );
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
 {
     WriteString( wxString(string) );


@@ -429,7 +459,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {

-    WriteString( wxString(&wc, m_conv, 1) );
+    WriteString( wxString(&wc, *m_conv, 1) );

 
     return *this;
 }
 
     return *this;
 }


@@ -486,16 +516,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {

-    //RN: Normally a single char on builds without a real
-    //wchar_t will call the wxUint16 version, which
-    //is not what we want (will print a 10 numeric value,
-    //not a newline).  Thus, we need to send it
-    //a string in that case instead.
-#if !wxUSE_UNICODE || wxWCHAR_T_IS_REAL_TYPE
-    return stream << wxT('\n');
-#else
-    return stream << wxT("\n");
-#endif
+    return stream.PutChar(wxT('\n'));

 }
 
 #endif
 }
 
 #endif