X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a96d2f45fec76a2d0da1c0c7672b62c19280f43..f41bc3e3f3fda37fba548440b230288c5eed0953:/include/wx/datstrm.h diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index ee557221a2..23630e63e2 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -16,63 +16,91 @@ #pragma interface "datstrm.h" #endif -#include +#include "wx/stream.h" +#include "wx/longlong.h" +#include "wx/strconv.h" #if wxUSE_STREAMS -class WXDLLEXPORT wxDataInputStream { +class WXDLLEXPORT wxDataInputStream +{ public: - wxDataInputStream(wxInputStream& s); - ~wxDataInputStream(); - - wxUint32 Read32(); - wxUint16 Read16(); - wxUint8 Read8(); - double ReadDouble(); - wxString ReadString(); - - wxDataInputStream& operator>>(wxString& s); - wxDataInputStream& operator>>(wxInt8& c); - wxDataInputStream& operator>>(wxInt16& i); - wxDataInputStream& operator>>(wxInt32& i); - wxDataInputStream& operator>>(wxUint8& c); - wxDataInputStream& operator>>(wxUint16& i); - wxDataInputStream& operator>>(wxUint32& i); - wxDataInputStream& operator>>(double& i); - wxDataInputStream& operator>>(float& f); - - void BidEndianOrdered(bool be_order) { m_be_order = be_order; } - protected: - wxInputStream *m_input; - bool m_be_order; +#if wxUSE_UNICODE + wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8); +#else + wxDataInputStream(wxInputStream& s); +#endif + ~wxDataInputStream(); + + bool IsOk() { return m_input->IsOk(); } + + wxUint64 Read64(); + wxUint32 Read32(); + wxUint16 Read16(); + wxUint8 Read8(); + double ReadDouble(); + wxString ReadString(); + + wxDataInputStream& operator>>(wxString& s); + wxDataInputStream& operator>>(wxInt8& c); + wxDataInputStream& operator>>(wxInt16& i); + wxDataInputStream& operator>>(wxInt32& i); + wxDataInputStream& operator>>(wxUint8& c); + wxDataInputStream& operator>>(wxUint16& i); + wxDataInputStream& operator>>(wxUint32& i); + wxDataInputStream& operator>>(wxUint64& i); + wxDataInputStream& operator>>(double& i); + wxDataInputStream& operator>>(float& f); + + void BigEndianOrdered(bool be_order) { m_be_order = be_order; } + +protected: + wxInputStream *m_input; + bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif }; -class WXDLLEXPORT wxDataOutputStream { - public: - wxDataOutputStream(wxOutputStream& s); - ~wxDataOutputStream(); - - void Write32(wxUint32 i); - void Write16(wxUint16 i); - void Write8(wxUint8 i); - void WriteDouble(double d); - void WriteString(const wxString& string); - - wxDataOutputStream& operator<<(const wxChar *string); - wxDataOutputStream& operator<<(wxString& string); - wxDataOutputStream& operator<<(wxInt8 c); - wxDataOutputStream& operator<<(wxInt16 i); - wxDataOutputStream& operator<<(wxInt32 i); - wxDataOutputStream& operator<<(wxUint8 c); - wxDataOutputStream& operator<<(wxUint16 i); - wxDataOutputStream& operator<<(wxUint32 i); - wxDataOutputStream& operator<<(double f); - wxDataOutputStream& operator<<(float f); - - void BidEndianOrdered(bool be_order) { m_be_order = be_order; } - protected: - wxOutputStream *m_output; - bool m_be_order; +class WXDLLEXPORT wxDataOutputStream +{ +public: +#if wxUSE_UNICODE + wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8); +#else + wxDataOutputStream(wxOutputStream& s); +#endif + ~wxDataOutputStream(); + + bool IsOk() { return m_output->IsOk(); } + + void Write64(wxUint64 i); + void Write32(wxUint32 i); + void Write16(wxUint16 i); + void Write8(wxUint8 i); + void WriteDouble(double d); + void WriteString(const wxString& string); + + wxDataOutputStream& operator<<(const wxChar *string); + wxDataOutputStream& operator<<(const wxString& string); + wxDataOutputStream& operator<<(wxInt8 c); + wxDataOutputStream& operator<<(wxInt16 i); + wxDataOutputStream& operator<<(wxInt32 i); + wxDataOutputStream& operator<<(wxUint8 c); + wxDataOutputStream& operator<<(wxUint16 i); + wxDataOutputStream& operator<<(wxUint32 i); + wxDataOutputStream& operator<<(wxUint64 i); + wxDataOutputStream& operator<<(double f); + wxDataOutputStream& operator<<(float f); + + void BigEndianOrdered(bool be_order) { m_be_order = be_order; } + +protected: + wxOutputStream *m_output; + bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif }; #endif