projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Solving link problem with 16 bits versions (wxProcessEvent, wxSpinEvent)
[wxWidgets.git]
/
include
/
wx
/
mstream.h
diff --git
a/include/wx/mstream.h
b/include/wx/mstream.h
index 187a0e65495592743949f22fdb6d89b7b3841062..7a71e8059a3dd3cdb442922f6b6d763ae0a9f188 100644
(file)
--- a/
include/wx/mstream.h
+++ b/
include/wx/mstream.h
@@
-11,7
+11,7
@@
#ifndef _WX_WXMMSTREAM_H__
#define _WX_WXMMSTREAM_H__
#ifndef _WX_WXMMSTREAM_H__
#define _WX_WXMMSTREAM_H__
-#include
<wx/stream.h>
+#include
"wx/stream.h"
#if wxUSE_STREAMS
#if wxUSE_STREAMS
@@
-22,10
+22,12
@@
class wxMemoryInputStream: public wxInputStream {
public:
wxMemoryInputStream(const char *data, size_t length);
virtual ~wxMemoryInputStream();
public:
wxMemoryInputStream(const char *data, size_t length);
virtual ~wxMemoryInputStream();
- virtual size_t
Stream
Size() const { return m_length; }
+ virtual size_t
Get
Size() const { return m_length; }
char Peek();
char Peek();
+ wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+
protected:
wxStreamBuffer *m_i_streambuf;
protected:
wxStreamBuffer *m_i_streambuf;
@@
-39,6
+41,11
@@
class wxMemoryOutputStream: public wxOutputStream {
public:
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream();
public:
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream();
+ virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
+
+ wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+
+ size_t CopyTo(char *buffer, size_t len) const;
protected:
wxStreamBuffer *m_o_streambuf;
protected:
wxStreamBuffer *m_o_streambuf;