wxGLCanvas works again

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index f70fb820ea2ea5be3dd90e41ec5730794efe9e55..c9d0bb7b84d34241bc62b49ec96591574430a619 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -114,8 +114,10 @@ class WXDLLEXPORT wxStreamBuffer {
 // ---------------------------------------------------------------------------
 
 typedef enum {
 // ---------------------------------------------------------------------------
 
 typedef enum {

-  wxStream_NOERROR,
-  wxStream_EOF
+  wxStream_NOERROR = 0,
+  wxStream_EOF,
+  wxStream_WRITE_ERR,
+  wxStream_READ_ERR

 } wxStreamError;
 
 class WXDLLEXPORT wxStreamBase {
 } wxStreamError;
 
 class WXDLLEXPORT wxStreamBase {


@@ -148,7 +150,7 @@ class WXDLLEXPORT wxInputStream: public wxStreamBase {
   // IO functions
   virtual char Peek();
   char GetC();
   // IO functions
   virtual char Peek();
   char GetC();

-  wxInputStream& Read(void *buffer, size_t size);
+  virtual wxInputStream& Read(void *buffer, size_t size);

   wxInputStream& Read(wxOutputStream& stream_out);
 
   // Position functions
   wxInputStream& Read(wxOutputStream& stream_out);
 
   // Position functions


@@ -189,7 +191,7 @@ class WXDLLEXPORT wxOutputStream: public wxStreamBase {
   wxOutputStream(wxStreamBuffer *sbuf);
   virtual ~wxOutputStream();
 
   wxOutputStream(wxStreamBuffer *sbuf);
   virtual ~wxOutputStream();
 

-  wxOutputStream& Write(const void *buffer, size_t size);
+  virtual wxOutputStream& Write(const void *buffer, size_t size);

   wxOutputStream& Write(wxInputStream& stream_in);
 
   off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
   wxOutputStream& Write(wxInputStream& stream_in);
 
   off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);