X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..f29fe16932ede752589ef9ed34a757342387932f:/include/wx/datstrm.h diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index ebe6a9e9ce..18738669d8 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -2,7 +2,7 @@ // Name: datstrm.h // Purpose: Data stream classes // Author: Guilhem Lavaux -// Modified by: +// Modified by: Mickael Gilabert // Created: 28/06/1998 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux @@ -12,7 +12,7 @@ #ifndef _WX_DATSTREAM_H_ #define _WX_DATSTREAM_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "datstrm.h" #endif @@ -22,7 +22,7 @@ #if wxUSE_STREAMS -class WXDLLEXPORT_BASE wxDataInputStream +class WXDLLIMPEXP_BASE wxDataInputStream { public: #if wxUSE_UNICODE @@ -41,6 +41,12 @@ public: double ReadDouble(); wxString ReadString(); + void Read64(wxUint64 *buffer, size_t size); + void Read32(wxUint32 *buffer, size_t size); + void Read16(wxUint16 *buffer, size_t size); + void Read8(wxUint8 *buffer, size_t size); + void ReadDouble(double *buffer, size_t size); + wxDataInputStream& operator>>(wxString& s); wxDataInputStream& operator>>(wxInt8& c); wxDataInputStream& operator>>(wxInt16& i); @@ -64,7 +70,7 @@ protected: DECLARE_NO_COPY_CLASS(wxDataInputStream) }; -class WXDLLEXPORT_BASE wxDataOutputStream +class WXDLLIMPEXP_BASE wxDataOutputStream { public: #if wxUSE_UNICODE @@ -83,6 +89,12 @@ public: void WriteDouble(double d); void WriteString(const wxString& string); + void Write64(const wxUint64 *buffer, size_t size); + void Write32(const wxUint32 *buffer, size_t size); + void Write16(const wxUint16 *buffer, size_t size); + void Write8(const wxUint8 *buffer, size_t size); + void WriteDouble(const double *buffer, size_t size); + wxDataOutputStream& operator<<(const wxChar *string); wxDataOutputStream& operator<<(const wxString& string); wxDataOutputStream& operator<<(wxInt8 c);