Initial work on virtual file system support for the WebKitGTK+ backend. It now suppor...

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

diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 24e09f1be394b4983735acec310e04dd7c87295a..14c7dca8a2eb92c937917bc9af5bd02df93cdbf5 100644 (file)
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/sstream.cpp
+// Name:        src/common/sstream.cpp

 // Purpose:     string-based streams implementation
 // Author:      Vadim Zeitlin
 // Modified by: Ryan Norton (UTF8 UNICODE)
 // Purpose:     string-based streams implementation
 // Author:      Vadim Zeitlin
 // Modified by: Ryan Norton (UTF8 UNICODE)


@@ -37,7 +37,7 @@
 // ----------------------------------------------------------------------------
 
 // TODO:  Do we want to include the null char in the stream?  If so then
 // ----------------------------------------------------------------------------
 
 // TODO:  Do we want to include the null char in the stream?  If so then

-// just add +1 to m_len in the ctor 
+// just add +1 to m_len in the ctor

 wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     // FIXME-UTF8: use wxCharBufferWithLength if we have it
 wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     // FIXME-UTF8: use wxCharBufferWithLength if we have it


@@ -56,9 +56,9 @@ wxStringInputStream::wxStringInputStream(const wxString& s)
 // getlength
 // ----------------------------------------------------------------------------
 
 // getlength
 // ----------------------------------------------------------------------------
 

-wxFileOffset wxStringInputStream::GetLength() const 
-{ 
-    return m_len; 
+wxFileOffset wxStringInputStream::GetLength() const
+{
+    return m_len;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -146,7 +146,7 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     const char *p = static_cast<const char *>(buffer);
 
 {
     const char *p = static_cast<const char *>(buffer);
 

-#if wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE

     // the part of the string we have here may be incomplete, i.e. it can stop
     // in the middle of an UTF-8 character and so converting it would fail; if
     // this is the case, accumulate the part which we failed to convert until
     // the part of the string we have here may be incomplete, i.e. it can stop
     // in the middle of an UTF-8 character and so converting it would fail; if
     // this is the case, accumulate the part which we failed to convert until


@@ -188,11 +188,10 @@ size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
         // not update m_pos as m_str hasn't changed
         return size;
     }
         // not update m_pos as m_str hasn't changed
         return size;
     }

-#else // !wxUSE_UNICODE_WCHAR
-    // no recoding necessary, the data is supposed to already be in UTF-8 (if
-    // supported) or ASCII otherwise
+#else // !wxUSE_UNICODE
+    // no recoding necessary

     m_str->append(p, size);
     m_str->append(p, size);

-#endif // wxUSE_UNICODE_WCHAR/!wxUSE_UNICODE_WCHAR
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
     // update position
     m_pos += size;
 
     // update position
     m_pos += size;