projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplified gradient code a bit
[wxWidgets.git]
/
include
/
wx
/
sstream.h
diff --git
a/include/wx/sstream.h
b/include/wx/sstream.h
index 9926e33700edae0c2793eada6acbd71a739b1a16..02f878681b10fd71ae52e66220397fca4c1365e0 100644
(file)
--- a/
include/wx/sstream.h
+++ b/
include/wx/sstream.h
@@
-25,13
+25,10
@@
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 wxFileOffset GetLength() const
{ return m_str.length(); }
+ virtual wxFileOffset GetLength() const
;
protected:
virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
protected:
virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
@@
-39,13
+36,18
@@
protected:
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)
};
@@
-81,6
+83,12
@@
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
DECLARE_NO_COPY_CLASS(wxStringOutputStream)
};
DECLARE_NO_COPY_CLASS(wxStringOutputStream)
};