X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a99acbb00a102458b8ad5ba4459712ba73d8b14d..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/datstrm.h diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index 23630e63e2..190ff341aa 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -2,17 +2,17 @@ // 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 -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DATSTREAM_H_ #define _WX_DATSTREAM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "datstrm.h" #endif @@ -22,7 +22,7 @@ #if wxUSE_STREAMS -class WXDLLEXPORT wxDataInputStream +class WXDLLIMPEXP_BASE wxDataInputStream { public: #if wxUSE_UNICODE @@ -30,8 +30,8 @@ public: #else wxDataInputStream(wxInputStream& s); #endif - ~wxDataInputStream(); - + ~wxDataInputStream(){} + bool IsOk() { return m_input->IsOk(); } wxUint64 Read64(); @@ -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); @@ -60,9 +66,11 @@ protected: #if wxUSE_UNICODE wxMBConv& m_conv; #endif + + DECLARE_NO_COPY_CLASS(wxDataInputStream) }; -class WXDLLEXPORT wxDataOutputStream +class WXDLLIMPEXP_BASE wxDataOutputStream { public: #if wxUSE_UNICODE @@ -70,7 +78,7 @@ public: #else wxDataOutputStream(wxOutputStream& s); #endif - ~wxDataOutputStream(); + ~wxDataOutputStream(){} bool IsOk() { return m_output->IsOk(); } @@ -81,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); @@ -101,6 +115,8 @@ protected: #if wxUSE_UNICODE wxMBConv& m_conv; #endif + + DECLARE_NO_COPY_CLASS(wxDataOutputStream) }; #endif