1. removed 'B' flag from treebase.cpp and regenerated the makefiles
2. fixed wxMemoryInputStream::Eof() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
// Copyright: (c) Guilhem Lavaux
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_WXMMSTREAM_H__
|
||||
#define _WX_WXMMSTREAM_H__
|
||||
|
||||
@@ -15,45 +16,47 @@
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {
|
||||
private:
|
||||
size_t m_length;
|
||||
|
||||
public:
|
||||
wxMemoryInputStream(const char *data, size_t length);
|
||||
virtual ~wxMemoryInputStream();
|
||||
virtual size_t GetSize() const { return m_length; }
|
||||
class WXDLLEXPORT wxMemoryInputStream : public wxInputStream
|
||||
{
|
||||
public:
|
||||
wxMemoryInputStream(const char *data, size_t length);
|
||||
virtual ~wxMemoryInputStream();
|
||||
virtual size_t GetSize() const { return m_length; }
|
||||
virtual bool Eof() const;
|
||||
|
||||
char Peek();
|
||||
char Peek();
|
||||
|
||||
wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
|
||||
wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
|
||||
|
||||
protected:
|
||||
wxStreamBuffer *m_i_streambuf;
|
||||
protected:
|
||||
wxStreamBuffer *m_i_streambuf;
|
||||
|
||||
protected:
|
||||
size_t OnSysRead(void *buffer, size_t nbytes);
|
||||
off_t OnSysSeek(off_t pos, wxSeekMode mode);
|
||||
off_t OnSysTell() const;
|
||||
size_t OnSysRead(void *buffer, size_t nbytes);
|
||||
off_t OnSysSeek(off_t pos, wxSeekMode mode);
|
||||
off_t OnSysTell() const;
|
||||
|
||||
private:
|
||||
size_t m_length;
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxMemoryOutputStream: public wxOutputStream {
|
||||
public:
|
||||
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
|
||||
virtual ~wxMemoryOutputStream();
|
||||
virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
|
||||
class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
|
||||
{
|
||||
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; }
|
||||
wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
|
||||
|
||||
size_t CopyTo(char *buffer, size_t len) const;
|
||||
size_t CopyTo(char *buffer, size_t len) const;
|
||||
|
||||
protected:
|
||||
wxStreamBuffer *m_o_streambuf;
|
||||
protected:
|
||||
wxStreamBuffer *m_o_streambuf;
|
||||
|
||||
protected:
|
||||
size_t OnSysWrite(const void *buffer, size_t nbytes);
|
||||
off_t OnSysSeek(off_t pos, wxSeekMode mode);
|
||||
off_t OnSysTell() const;
|
||||
protected:
|
||||
size_t OnSysWrite(const void *buffer, size_t nbytes);
|
||||
off_t OnSysSeek(off_t pos, wxSeekMode mode);
|
||||
off_t OnSysTell() const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user