build fixes

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 62dced04473ba7f5ddaa730d8547d98e2a39cafb..73522f1c3774a0d828ab63d1abf7f1115fe635c2 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -21,9 +21,9 @@
 #include "wx/string.h"
 #include "wx/filefn.h"  // for wxFileOffset, wxInvalidOffset and wxSeekMode
 
 #include "wx/string.h"
 #include "wx/filefn.h"  // for wxFileOffset, wxInvalidOffset and wxSeekMode
 

-class WXDLLIMPEXP_BASE wxStreamBase;
-class WXDLLIMPEXP_BASE wxInputStream;
-class WXDLLIMPEXP_BASE wxOutputStream;
+class WXDLLIMPEXP_FWD_BASE wxStreamBase;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_BASE wxOutputStream;

 
 typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
 typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
 typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
 typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);


@@ -42,6 +42,8 @@ enum wxStreamError
     wxSTREAM_READ_ERROR         // generic read error
 };
 
     wxSTREAM_READ_ERROR         // generic read error
 };
 

+const int wxEOF = -1;
+

 // ============================================================================
 // base stream classes: wxInputStream and wxOutputStream
 // ============================================================================
 // ============================================================================
 // base stream classes: wxInputStream and wxOutputStream
 // ============================================================================


@@ -50,7 +52,7 @@ enum wxStreamError
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxStreamBase
+class WXDLLIMPEXP_BASE wxStreamBase : public wxObject

 {
 public:
     wxStreamBase();
 {
 public:
     wxStreamBase();


@@ -80,6 +82,7 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

+    DECLARE_ABSTRACT_CLASS(wxStreamBase)

     DECLARE_NO_COPY_CLASS(wxStreamBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStreamBase)
 };
 


@@ -106,11 +109,11 @@ public:
     // undefined), otherwise 1
     virtual char Peek();
 
     // undefined), otherwise 1
     virtual char Peek();
 

-    // return one character from the stream, blocking until it appears if
+    // return one byte from the stream, blocking until it appears if

     // necessary
     //
     // necessary
     //

-    // if EOF, return value is undefined and LastRead() will return 0 and not 1
-    char GetC();
+    // on success returns a value between 0 - 255, or wxEOF on EOF or error.
+    int GetC();

 
     // read at most the given number of bytes from the stream
     //
 
     // read at most the given number of bytes from the stream
     //


@@ -214,6 +217,7 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

+    DECLARE_ABSTRACT_CLASS(wxInputStream)

     DECLARE_NO_COPY_CLASS(wxInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxInputStream)
 };
 


@@ -249,6 +253,7 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

+    DECLARE_ABSTRACT_CLASS(wxOutputStream)

     DECLARE_NO_COPY_CLASS(wxOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxOutputStream)
 };
 


@@ -276,6 +281,7 @@ protected:
 
     size_t m_currentPos;
 
 
     size_t m_currentPos;
 

+    DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)

     DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
 };
 


@@ -301,6 +307,7 @@ protected:
     wxInputStream *m_parent_i_stream;
     bool m_owns;
 
     wxInputStream *m_parent_i_stream;
     bool m_owns;
 

+    DECLARE_ABSTRACT_CLASS(wxFilterInputStream)

     DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 


@@ -322,6 +329,7 @@ protected:
     wxOutputStream *m_parent_o_stream;
     bool m_owns;
 
     wxOutputStream *m_parent_o_stream;
     bool m_owns;
 

+    DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)

     DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
 };
 


@@ -346,12 +354,12 @@ public:
     virtual const wxChar * const *GetProtocols(wxStreamProtocolType type
                                                = wxSTREAM_PROTOCOL) const = 0;
 
     virtual const wxChar * const *GetProtocols(wxStreamProtocolType type
                                                = wxSTREAM_PROTOCOL) const = 0;
 

-    bool CanHandle(const wxChar *protocol,
+    bool CanHandle(const wxString& protocol,

                    wxStreamProtocolType type
                    = wxSTREAM_PROTOCOL) const;
 
 protected:
                    wxStreamProtocolType type
                    = wxSTREAM_PROTOCOL) const;
 
 protected:

-    wxString::size_type FindExtension(const wxChar *location) const;
+    wxString::size_type FindExtension(const wxString& location) const;

 
     DECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase)
 };
 
     DECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase)
 };


@@ -366,7 +374,7 @@ public:
     virtual wxFilterInputStream  *NewStream(wxInputStream *stream)  const = 0;
     virtual wxFilterOutputStream *NewStream(wxOutputStream *stream) const = 0;
 
     virtual wxFilterInputStream  *NewStream(wxInputStream *stream)  const = 0;
     virtual wxFilterOutputStream *NewStream(wxOutputStream *stream) const = 0;
 

-    static const wxFilterClassFactory *Find(const wxChar *protocol,
+    static const wxFilterClassFactory *Find(const wxString& protocol,

                                             wxStreamProtocolType type
                                             = wxSTREAM_PROTOCOL);
 
                                             wxStreamProtocolType type
                                             = wxSTREAM_PROTOCOL);
 


@@ -426,6 +434,7 @@ public:
 
     // Buffer control
     void ResetBuffer();
 
     // Buffer control
     void ResetBuffer();

+    void Truncate();

 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()
 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()