// 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__
-#pragma interface "datstrm.h"
-#endif
-
#include "wx/stream.h"
+#include "wx/longlong.h"
+#include "wx/strconv.h"
#if wxUSE_STREAMS
-class WXDLLEXPORT wxDataInputStream
+class WXDLLIMPEXP_BASE wxDataInputStream
{
public:
+#if wxUSE_UNICODE
+ wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8);
+#else
wxDataInputStream(wxInputStream& s);
- ~wxDataInputStream();
+#endif
+ ~wxDataInputStream(){}
+ bool IsOk() { return m_input->IsOk(); }
+
+ wxUint64 Read64();
wxUint32 Read32();
wxUint16 Read16();
wxUint8 Read8();
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);
wxDataInputStream& operator>>(wxUint8& c);
wxDataInputStream& operator>>(wxUint16& i);
wxDataInputStream& operator>>(wxUint32& i);
+ wxDataInputStream& operator>>(wxUint64& i);
wxDataInputStream& operator>>(double& i);
wxDataInputStream& operator>>(float& f);
protected:
wxInputStream *m_input;
bool m_be_order;
+#if wxUSE_UNICODE
+ wxMBConv& m_conv;
+#endif
+
+ DECLARE_NO_COPY_CLASS(wxDataInputStream)
};
-class WXDLLEXPORT wxDataOutputStream
+class WXDLLIMPEXP_BASE wxDataOutputStream
{
public:
+#if wxUSE_UNICODE
+ wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8);
+#else
wxDataOutputStream(wxOutputStream& s);
- ~wxDataOutputStream();
+#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);
+ 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);
wxDataOutputStream& operator<<(wxUint8 c);
wxDataOutputStream& operator<<(wxUint16 i);
wxDataOutputStream& operator<<(wxUint32 i);
+ wxDataOutputStream& operator<<(wxUint64 i);
wxDataOutputStream& operator<<(double f);
wxDataOutputStream& operator<<(float f);
protected:
wxOutputStream *m_output;
bool m_be_order;
+#if wxUSE_UNICODE
+ wxMBConv& m_conv;
+#endif
+
+ DECLARE_NO_COPY_CLASS(wxDataOutputStream)
};
#endif