1. wxGrid fixes contributed by Gerhard Gruber (client data for cells...)

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 25f04afbcca039f977ec578102b1a99407003670..0b572026edc1d67b22c256397bdd379d6c656433 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -16,6 +16,10 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_STREAMS
+

 #include <stdio.h>
 #include "wx/object.h"
 #include "wx/string.h"
 #include <stdio.h>
 #include "wx/object.h"
 #include "wx/string.h"


@@ -150,7 +154,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


@@ -165,19 +169,18 @@ class WXDLLEXPORT wxInputStream: public wxStreamBase {
   wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
   wxInputStream& operator>>(wxString& line);
   wxInputStream& operator>>(char& c);
   wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
   wxInputStream& operator>>(wxString& line);
   wxInputStream& operator>>(char& c);

-  wxInputStream& operator>>(short& i);
-  wxInputStream& operator>>(int& i);
-  wxInputStream& operator>>(long& i);
+  wxInputStream& operator>>(signed short& i);
+  wxInputStream& operator>>(signed int& i);
+  wxInputStream& operator>>(signed long& i);
+  wxInputStream& operator>>(unsigned char& c);
+  wxInputStream& operator>>(unsigned short& i);
+  wxInputStream& operator>>(unsigned int& i);
+  wxInputStream& operator>>(unsigned long& i);

   wxInputStream& operator>>(double& i);
   wxInputStream& operator>>(double& i);

+  wxInputStream& operator>>(float& f) { double d; operator>>((double&)d); f = (float)d; return *this; }

 #if wxUSE_SERIAL
   wxInputStream& operator>>(wxObject *& obj);
 #endif
 #if wxUSE_SERIAL
   wxInputStream& operator>>(wxObject *& obj);
 #endif

-
-  wxInputStream& operator>>(float& f) { double d; operator>>((double&)d); f = (float)d; return *this; }
-  wxInputStream& operator>>(unsigned char& c) { return operator>>((char&)c); }
-  wxInputStream& operator>>(unsigned short& i) { return operator>>((short&)i); }
-  wxInputStream& operator>>(unsigned int& i) { return operator>>((int&)i); }
-  wxInputStream& operator>>(unsigned long& i) { return operator>>((long&)i); }

   wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
 
  protected:
   wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
 
  protected:


@@ -191,7 +194,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);


@@ -206,19 +209,18 @@ class WXDLLEXPORT wxOutputStream: public wxStreamBase {
   wxOutputStream& operator<<(const char *string);
   wxOutputStream& operator<<(wxString& string);
   wxOutputStream& operator<<(char c);
   wxOutputStream& operator<<(const char *string);
   wxOutputStream& operator<<(wxString& string);
   wxOutputStream& operator<<(char c);

-  wxOutputStream& operator<<(short i);
-  wxOutputStream& operator<<(int i);
-  wxOutputStream& operator<<(long i);
+  wxOutputStream& operator<<(signed short i);
+  wxOutputStream& operator<<(signed int i);
+  wxOutputStream& operator<<(signed long i);
+  wxOutputStream& operator<<(unsigned char c);
+  wxOutputStream& operator<<(unsigned short i);
+  wxOutputStream& operator<<(unsigned int i);
+  wxOutputStream& operator<<(unsigned long i);

   wxOutputStream& operator<<(double f);
   wxOutputStream& operator<<(double f);

+  wxOutputStream& operator<<(float f) { return operator<<((double)f); }

 #if wxUSE_SERIAL
   wxOutputStream& operator<<(wxObject& obj);
 #endif
 #if wxUSE_SERIAL
   wxOutputStream& operator<<(wxObject& obj);
 #endif

-
-  wxOutputStream& operator<<(float f) { return operator<<((double)f); }
-  wxOutputStream& operator<<(unsigned char c) { return operator<<((char)c); }
-  wxOutputStream& operator<<(unsigned short i) { return operator<<((short)i); }
-  wxOutputStream& operator<<(unsigned int i) { return operator<<((int)i); }
-  wxOutputStream& operator<<(unsigned long i) { return operator<<((long)i); }

   wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
 
  protected:
   wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
 
  protected:


@@ -259,3 +261,7 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
 };
 
 #endif
 };
 
 #endif

+  // wxUSE_STREAMS
+
+#endif
+  // _WX_WXSTREAM_H__