X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb28cc9e757a89926ab437141218db72973b655d..39bc0347fda3505f7fb43447f21efd84b9e00b3c:/src/common/sstream.cpp

diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 0e783fb640..a16ea1b24a 100644
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -42,7 +42,7 @@ wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
 #else
-    : m_str(s), m_buf((char*)s.c_str()), m_len(s.length())
+    : m_str(s), m_buf((char*)(const char*)s.c_str()), m_len(s.length())
 #endif
 {
 #if wxUSE_UNICODE
@@ -93,10 +93,11 @@ wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
             return wxInvalidOffset;
     }
 
-    if ( ofs < 0 || wx_static_cast(size_t, ofs) > m_len )
+    if ( ofs < 0 || ofs > wx_static_cast(wxFileOffset, m_len) )
         return wxInvalidOffset;
 
-    m_pos = wx_static_cast(size_t, ofs);
+    // FIXME: this can't be right
+    m_pos = wx_truncate_cast(size_t, ofs);
 
     return ofs;
 }