added XBM example to image sample

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 44660c9e90bd0e7a262dfe8b654110c02c41d1c6..c2f6a3d45c4a2e9cc4e5a4da76bde5b75a9439cc 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -119,6 +119,7 @@ class WXDLLEXPORT wxOutputStream: public wxStreamBase {
   wxOutputStream();
   virtual ~wxOutputStream();
 
+  void PutC(char c);
   virtual wxOutputStream& Write(const void *buffer, size_t size);
   wxOutputStream& Write(wxInputStream& stream_in);
 
@@ -170,7 +171,6 @@ class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
 
   char Peek() { return m_parent_i_stream->Peek(); }
 
-  wxStreamError LastError() const { return m_parent_i_stream->LastError(); }
   size_t GetSize() const { return m_parent_i_stream->GetSize(); }
 
  protected:
@@ -183,7 +183,6 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
   wxFilterOutputStream(wxOutputStream& stream);
   ~wxFilterOutputStream();
 
-  wxStreamError LastError() const { return m_parent_o_stream->LastError(); }
   size_t GetSize() const { return m_parent_o_stream->GetSize(); }
 
  protected:
@@ -216,6 +215,7 @@ class WXDLLEXPORT wxStreamBuffer {
   size_t Write(const void *buffer, size_t size);
   size_t Write(wxStreamBuffer *buf);
 
+  char Peek();
   char GetChar();
   void PutChar(char c);
   off_t Tell() const;
@@ -254,9 +254,6 @@ class WXDLLEXPORT wxStreamBuffer {
   char *m_buffer_start, *m_buffer_end, *m_buffer_pos;
   size_t m_buffer_size;
 
-  char *m_wback;
-  size_t m_wbacksize, m_wbackcur;
-
   bool m_fixed, m_flushable;
 
   wxStreamBase *m_stream;
@@ -273,6 +270,7 @@ class wxBufferedInputStream: public wxFilterInputStream {
   wxBufferedInputStream(wxInputStream& stream);
   ~wxBufferedInputStream();
 
+  char Peek();
   wxInputStream& Read(void *buffer, size_t size);
   
   // Position functions