added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index a222f1bc1aa48112e354e474819745448bef9fed..18738669d8890455ac722575159194c535b08b3f 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -2,29 +2,34 @@
 // Name:        datstrm.h
 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux
 // 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DATSTREAM_H_
 #define _WX_DATSTREAM_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "datstrm.h"
 #endif
 
 #include "wx/stream.h"
 #include "wx/longlong.h"
 #pragma interface "datstrm.h"
 #endif
 
 #include "wx/stream.h"
 #include "wx/longlong.h"

+#include "wx/strconv.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT wxDataInputStream
+class WXDLLIMPEXP_BASE wxDataInputStream

 {
 public:
 {
 public:

+#if wxUSE_UNICODE
+    wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8);
+#else

     wxDataInputStream(wxInputStream& s);
     wxDataInputStream(wxInputStream& s);

+#endif

     ~wxDataInputStream();
     
     bool IsOk() { return m_input->IsOk(); }
     ~wxDataInputStream();
     
     bool IsOk() { return m_input->IsOk(); }


@@ -36,6 +41,12 @@ public:
     double ReadDouble();
     wxString ReadString();
 
     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>>(wxString& s);
     wxDataInputStream& operator>>(wxInt8& c);
     wxDataInputStream& operator>>(wxInt16& i);


@@ -52,12 +63,21 @@ public:
 protected:
     wxInputStream *m_input;
     bool m_be_order;
 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:
 {
 public:

+#if wxUSE_UNICODE
+    wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8);
+#else

     wxDataOutputStream(wxOutputStream& s);
     wxDataOutputStream(wxOutputStream& s);

+#endif

     ~wxDataOutputStream();
 
     bool IsOk() { return m_output->IsOk(); }
     ~wxDataOutputStream();
 
     bool IsOk() { return m_output->IsOk(); }


@@ -69,6 +89,12 @@ public:
     void WriteDouble(double d);
     void WriteString(const wxString& string);
 
     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<<(const wxChar *string);
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);


@@ -86,6 +112,11 @@ public:
 protected:
     wxOutputStream *m_output;
     bool m_be_order;
 protected:
     wxOutputStream *m_output;
     bool m_be_order;

+#if wxUSE_UNICODE
+    wxMBConv& m_conv;
+#endif
+
+    DECLARE_NO_COPY_CLASS(wxDataOutputStream)

 };
 
 #endif
 };
 
 #endif