Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 7d276e665be2a3c2343632d89f262666f304536d..740ebbf5519445c5e2b2e3590908f32d86f3602a 100644 (file)
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -86,7 +86,7 @@ wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
             return wxInvalidOffset;
     }
 
-    if ( ofs < 0 || ofs > wx_static_cast(wxFileOffset, m_len) )
+    if ( ofs < 0 || ofs > static_cast<wxFileOffset>(m_len) )
         return wxInvalidOffset;
 
     // FIXME: this can't be right
@@ -97,7 +97,7 @@ wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
 
 wxFileOffset wxStringInputStream::OnSysTell() const
 {
-    return wx_static_cast(wxFileOffset, m_pos);
+    return static_cast<wxFileOffset>(m_pos);
 }
 
 // ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ size_t wxStringInputStream::OnSysRead(void *buffer, size_t size)
 
 wxFileOffset wxStringOutputStream::OnSysTell() const
 {
-    return wx_static_cast(wxFileOffset, m_pos);
+    return static_cast<wxFileOffset>(m_pos);
 }
 
 // ----------------------------------------------------------------------------
@@ -144,7 +144,7 @@ wxFileOffset wxStringOutputStream::OnSysTell() const
 
 size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-    const char *p = wx_static_cast(const char *, buffer);
+    const char *p = static_cast<const char *>(buffer);
 
 #if wxUSE_UNICODE_WCHAR
     // the part of the string we have here may be incomplete, i.e. it can stop
@@ -167,13 +167,14 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
         srcLen = size;
     }
 
-    wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, NULL /* out len */));
+    size_t wlen;
+    wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, &wlen));
     if ( wbuf )
     {
         // conversion succeeded, clear the unconverted buffer
         m_unconv = wxMemoryBuffer(0);
 
-        *m_str += wbuf;
+        m_str->append(wbuf, wlen);
     }
     else // conversion failed
     {