corrected to allow drag and drop for mingw32/gcc295

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 25f04afbcca039f977ec578102b1a99407003670..efef1ec113bfa67380b93ba8659b10ef9af0e248 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"


@@ -30,6 +34,160 @@ typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
 WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
 
 
 WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
 

+// ---------------------------------------------------------------------------
+// wxStream: base classes
+// ---------------------------------------------------------------------------
+
+#define wxStream_NOERROR    wxSTREAM_NOERROR
+#define wxStream_EOF        wxSTREAM_EOF
+#define wxStream_WRITE_ERR  wxSTREAM_WRITE_ERROR
+#define wxStream_READ_ERR   wxSTREAM_READ_ERROR
+  
+typedef enum {
+  wxStream_NOERROR = 0,
+  wxStream_EOF,
+  wxStream_WRITE_ERR,
+  wxStream_READ_ERR
+} wxStreamError;
+
+class WXDLLEXPORT wxStreamBase {
+ public:
+  wxStreamBase();
+  virtual ~wxStreamBase();
+
+  bool operator!() const { return (LastError() != wxSTREAM_NOERROR); }
+  wxStreamError LastError() const { return m_lasterror; }
+  virtual size_t GetSize() const { return ~((size_t)0); }
+  size_t StreamSize() const { return GetSize(); }
+
+ protected:
+
+  virtual size_t OnSysRead(void *buffer, size_t bufsize);
+  virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
+  virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
+  virtual off_t OnSysTell() const;
+
+ protected:
+  friend class wxStreamBuffer;
+
+  size_t m_lastcount;
+  wxStreamError m_lasterror;
+};
+
+class WXDLLEXPORT wxInputStream: public wxStreamBase {
+ public:
+  wxInputStream();
+  virtual ~wxInputStream();
+
+  // IO functions
+  virtual char Peek();
+  char GetC();
+  virtual wxInputStream& Read(void *buffer, size_t size);
+  wxInputStream& Read(wxOutputStream& stream_out);
+
+  // Position functions
+  virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
+  virtual off_t TellI() const;
+
+  // State functions
+  virtual size_t LastRead() { return wxStreamBase::m_lastcount; }
+
+  // Ungetch
+  size_t Ungetch(const void *buffer, size_t size);
+  bool Ungetch(char c);
+
+  // Operators
+  wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
+#if wxUSE_SERIAL
+  wxInputStream& operator>>(wxObject *& obj);
+#endif
+  wxInputStream& operator>>( __wxInputManip func) { return func(*this); }
+
+ protected:
+  // Ungetch managers
+  char *m_wback;
+  size_t m_wbacksize;
+  size_t m_wbackcur;
+
+  char *AllocSpaceWBack(size_t needed_size);
+  size_t GetWBack(char *buf, size_t bsize);
+
+};
+
+class WXDLLEXPORT wxOutputStream: public wxStreamBase {
+ public:
+  wxOutputStream();
+  virtual ~wxOutputStream();
+
+  virtual wxOutputStream& Write(const void *buffer, size_t size);
+  wxOutputStream& Write(wxInputStream& stream_in);
+
+  virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
+  virtual off_t TellO() const;
+
+  virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; }
+
+  virtual void Sync();
+
+  wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
+#if wxUSE_SERIAL
+  wxOutputStream& operator<<(wxObject& obj);
+#endif
+  wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
+};
+
+// ---------------------------------------------------------------------------
+// A stream for measuring streamed output
+// ---------------------------------------------------------------------------
+
+class wxCountingOutputStream: public wxOutputStream {
+ public:
+  wxCountingOutputStream();
+
+  size_t GetSize() const;
+  bool Ok() const { return TRUE; }
+
+ protected:
+
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  size_t m_currentPos;
+};
+
+
+// ---------------------------------------------------------------------------
+// "Filter" streams
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
+ public:
+  wxFilterInputStream();
+  wxFilterInputStream(wxInputStream& stream);
+  ~wxFilterInputStream();
+
+  char Peek() { return m_parent_i_stream->Peek(); }
+
+  size_t GetSize() const { return m_parent_i_stream->GetSize(); }
+
+ protected:
+  wxInputStream *m_parent_i_stream;
+};
+
+class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
+ public:
+  wxFilterOutputStream();
+  wxFilterOutputStream(wxOutputStream& stream);
+  ~wxFilterOutputStream();
+
+  size_t GetSize() const { return m_parent_o_stream->GetSize(); }
+
+ protected:
+  wxOutputStream *m_parent_o_stream;
+};
+

 // ---------------------------------------------------------------------------
 // Stream buffer
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Stream buffer
 // ---------------------------------------------------------------------------


@@ -56,8 +214,7 @@ class WXDLLEXPORT wxStreamBuffer {
   size_t Write(const void *buffer, size_t size);
   size_t Write(wxStreamBuffer *buf);
 
   size_t Write(const void *buffer, size_t size);
   size_t Write(wxStreamBuffer *buf);
 

-  size_t WriteBack(const char *buffer, size_t size);
-  bool WriteBack(char c);
+  char Peek();

   char GetChar();
   void PutChar(char c);
   off_t Tell() const;
   char GetChar();
   void PutChar(char c);
   off_t Tell() const;


@@ -89,9 +246,6 @@ class WXDLLEXPORT wxStreamBuffer {
   wxStreamBase *Stream() { return m_stream; }
 
  protected:
   wxStreamBase *Stream() { return m_stream; }
 
  protected:

-  char *AllocSpaceWBack(size_t needed_size);
-  size_t GetWBack(char *buf, size_t bsize);
-

   void GetFromBuffer(void *buffer, size_t size);
   void PutToBuffer(const void *buffer, size_t size);
 
   void GetFromBuffer(void *buffer, size_t size);
   void PutToBuffer(const void *buffer, size_t size);
 


@@ -110,152 +264,58 @@ class WXDLLEXPORT wxStreamBuffer {
 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------

-// wxStream: base classes
+// wxBufferedStreams

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-typedef enum {
-  wxStream_NOERROR = 0,
-  wxStream_EOF,
-  wxStream_WRITE_ERR,
-  wxStream_READ_ERR
-} wxStreamError;
-
-class WXDLLEXPORT wxStreamBase {
- public:
-  wxStreamBase();
-  virtual ~wxStreamBase();
-
-  wxStreamError LastError() const { return m_lasterror; }
-  virtual size_t StreamSize() const { return ~((size_t)0); }
-
- protected:
-  friend class wxStreamBuffer;
-
-  virtual size_t OnSysRead(void *buffer, size_t bufsize);
-  virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
-  virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
-  virtual off_t OnSysTell() const;
-
- protected:
-  size_t m_lastcount;
-  wxStreamError m_lasterror;
-};
-
-class WXDLLEXPORT wxInputStream: public wxStreamBase {
+class wxBufferedInputStream: public wxFilterInputStream {

  public:
  public:

-  wxInputStream();
-  wxInputStream(wxStreamBuffer *sbuf);
-  virtual ~wxInputStream();
+  wxBufferedInputStream(wxInputStream& stream);
+  ~wxBufferedInputStream();

 
 

-  // IO functions
-  virtual char Peek();
-  char GetC();
+  char Peek();

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

-  wxInputStream& Read(wxOutputStream& stream_out);
-
+  

   // Position functions
   off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
   off_t TellI() const;
 
   // Position functions
   off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
   off_t TellI() const;
 

-  // State functions
-  wxStreamBuffer *InputStreamBuffer() { return m_i_streambuf; }
-  size_t LastRead() { return wxStreamBase::m_lastcount; }
+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }

 
 

-  // Operators
-  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>>(double& i);
-#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:
+  size_t OnSysRead(void *buffer, size_t bufsize);
+  off_t OnSysSeek(off_t seek, wxSeekMode mode);
+  off_t OnSysTell() const;  

 
  protected:
 
  protected:

-  bool m_i_destroybuf;

   wxStreamBuffer *m_i_streambuf;
 };
 
   wxStreamBuffer *m_i_streambuf;
 };
 

-class WXDLLEXPORT wxOutputStream: public wxStreamBase {
+class wxBufferedOutputStream: public wxFilterOutputStream {

  public:
  public:

-  wxOutputStream();
-  wxOutputStream(wxStreamBuffer *sbuf);
-  virtual ~wxOutputStream();
+  wxBufferedOutputStream(wxOutputStream& stream);
+  ~wxBufferedOutputStream();

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

-  wxOutputStream& Write(wxInputStream& stream_in);
-
+  
+  // Position functions

   off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
   off_t TellO() const;
 
   off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
   off_t TellO() const;
 

-  size_t LastWrite() const { return wxStreamBase::m_lastcount; }
-  wxStreamBuffer *OutputStreamBuffer() { return m_o_streambuf; }
-

   void Sync();
 
   void Sync();
 

-  wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
-  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<<(double f);
-#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); }
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }

 
  protected:
 
  protected:

-  bool m_o_destroybuf;
-  wxStreamBuffer *m_o_streambuf;
-};
-
-// ---------------------------------------------------------------------------
-// "Filter" streams
-// ---------------------------------------------------------------------------
-
-class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
- public:
-  wxFilterInputStream();
-  wxFilterInputStream(wxInputStream& stream);
-  ~wxFilterInputStream();
-
-  char Peek() { return m_parent_i_stream->Peek(); }
-
-  wxStreamError LastError() const { return m_parent_i_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_i_stream->StreamSize(); }
+  size_t OnSysWrite(const void *buffer, size_t bufsize);
+  off_t OnSysSeek(off_t seek, wxSeekMode mode);
+  off_t OnSysTell() const;  

 
  protected:
 
  protected:

-  wxInputStream *m_parent_i_stream;
+  wxStreamBuffer *m_o_streambuf;

 };
 
 };
 

-class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
- public:
-  wxFilterOutputStream();
-  wxFilterOutputStream(wxOutputStream& stream);
-  ~wxFilterOutputStream();
-
-  wxStreamError LastError() const { return m_parent_o_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_o_stream->StreamSize(); }
-
- protected:
-  wxOutputStream *m_parent_o_stream;
-};
+#endif
+  // wxUSE_STREAMS

 
 #endif
 
 #endif

+  // _WX_WXSTREAM_H__