BC++ 5.5 and later supports wxUSE_ON_FATAL_EXCEPTION

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 00e35884d7063c487ebdd1c216a10922c6095368..76d82f61333c8021180d43e810e7cc2f001995e3 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -2,17 +2,17 @@
 // 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 licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DATSTREAM_H_
 #define _WX_DATSTREAM_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 
 #pragma interface "datstrm.h"
 #endif
 


@@ -22,7 +22,7 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT wxDataInputStream
+class WXDLLIMPEXP_BASE wxDataInputStream

 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE


@@ -31,7 +31,7 @@ public:
     wxDataInputStream(wxInputStream& s);
 #endif
     ~wxDataInputStream();
     wxDataInputStream(wxInputStream& s);
 #endif
     ~wxDataInputStream();

-    
+

     bool IsOk() { return m_input->IsOk(); }
 
     wxUint64 Read64();
     bool IsOk() { return m_input->IsOk(); }
 
     wxUint64 Read64();


@@ -41,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);


@@ -64,7 +70,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 

-class WXDLLEXPORT wxDataOutputStream
+class WXDLLIMPEXP_BASE wxDataOutputStream

 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE


@@ -83,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);