another fix for wxUSE_DRAG_AND_DROP==0 build

[wxWidgets.git] / include / wx / sstream.h

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index f8e75790ab940b88465b754e8851f256f4fe3321..61ac6044d52426f3fa1267e86932dc7644e2f45d 100644 (file)
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -26,7 +26,6 @@ public:
     // ctor associates the stream with the given string which makes a copy of
     // it
     wxStringInputStream(const wxString& s);
     // ctor associates the stream with the given string which makes a copy of
     // it
     wxStringInputStream(const wxString& s);

-    virtual ~wxStringInputStream();

 
     virtual wxFileOffset GetLength() const;
 
 
     virtual wxFileOffset GetLength() const;
 


@@ -40,7 +39,7 @@ private:
     wxString m_str;
 
     // the buffer we're reading from
     wxString m_str;
 
     // the buffer we're reading from

-    char* m_buf;
+    wxCharBuffer m_buf;

 
     // length of the buffer we're reading from
     size_t m_len;
 
     // length of the buffer we're reading from
     size_t m_len;


@@ -60,9 +59,14 @@ class WXDLLIMPEXP_BASE wxStringOutputStream : public wxOutputStream
 public:
     // The stream will write data either to the provided string or to an
     // internal string which can be retrieved using GetString()
 public:
     // The stream will write data either to the provided string or to an
     // internal string which can be retrieved using GetString()

-    wxStringOutputStream(wxString *pString = NULL)
+    //
+    // Note that the conversion object should have the life time greater than
+    // this stream.
+    wxStringOutputStream(wxString *pString = NULL,
+                         wxMBConv& conv = wxConvUTF8)
+        : m_conv(conv)

 #if wxUSE_UNICODE_WCHAR
 #if wxUSE_UNICODE_WCHAR

-        : m_unconv(0)
+        , m_unconv(0)

 #endif // wxUSE_UNICODE_WCHAR
     {
         m_str = pString ? pString : &m_strInternal;
 #endif // wxUSE_UNICODE_WCHAR
     {
         m_str = pString ? pString : &m_strInternal;


@@ -86,12 +90,10 @@ private:
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 

-#if wxUSE_WCHAR_T
-    // string encoding converter (UTF8 is the standard)
-    wxMBConvUTF8 m_conv;
-#else
-    wxMBConv m_conv;
-#endif
+    // converter to use: notice that with the default UTF-8 one the input
+    // stream must contain valid UTF-8 data, use wxConvISO8859_1 to work with
+    // arbitrary 8 bit data
+    wxMBConv& m_conv;

 
 #if wxUSE_UNICODE_WCHAR
     // unconverted data from the last call to OnSysWrite()
 
 #if wxUSE_UNICODE_WCHAR
     // unconverted data from the last call to OnSysWrite()