GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.

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

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 0bc18690ed23c729a9c3205cb2a9f5ecb9881c0c..b264c670216d9704968cd05bf9f31fcd619b6310 100644 (file)
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -25,27 +25,29 @@ class WXDLLIMPEXP_BASE wxStringInputStream : public wxInputStream
 public:
     // ctor associates the stream with the given string which makes a copy of
     // it
 public:
     // ctor associates the stream with the given string which makes a copy of
     // it

-    wxStringInputStream(const wxString& s)
-        : m_str(s)
-    {
-        m_pos = 0;
-    }
+    wxStringInputStream(const wxString& s);
+    virtual ~wxStringInputStream();

 
 

-    virtual size_t GetSize() const { return m_str.length(); }
+    virtual wxFileOffset GetLength() const;

 
 protected:
 
 protected:

-    virtual off_t OnSysSeek(off_t ofs, wxSeekMode mode);
-    virtual off_t OnSysTell() const;
+    virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
+    virtual wxFileOffset OnSysTell() const;

     virtual size_t OnSysRead(void *buffer, size_t size);
 
 private:
     virtual size_t OnSysRead(void *buffer, size_t size);
 
 private:

-    // the string we're reading from
+    // the string that was passed in the ctor

     wxString m_str;
 
     wxString m_str;
 

+    // the buffer we're reading from
+    char* m_buf;
+
+    // length of the buffer we're reading from
+    size_t m_len;
+

     // 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;
 

-

     DECLARE_NO_COPY_CLASS(wxStringInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxStringInputStream)
 };
 


@@ -68,6 +70,7 @@ public:
     const wxString& GetString() const { return *m_str; }
 
 protected:
     const wxString& GetString() const { return *m_str; }
 
 protected:

+    virtual wxFileOffset OnSysTell() const;

     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 private:
     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 private:


@@ -80,6 +83,8 @@ 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;
 

+    // string encoding converter (UTF8 is the standard)
+    wxMBConvUTF8 m_conv;

 
     DECLARE_NO_COPY_CLASS(wxStringOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxStringOutputStream)
 };