added more HP-UX charset names

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index ebe6a9e9ce2a75c12882b5743b79337ed513001f..7551c3c24b9ddf9f638f5f51ba4a242490ca0abc 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -2,27 +2,23 @@
 // 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__)
-#pragma interface "datstrm.h"
-#endif
-

 #include "wx/stream.h"
 #include "wx/longlong.h"
 #include "wx/strconv.h"
 
 #if wxUSE_STREAMS
 
 #include "wx/stream.h"
 #include "wx/longlong.h"
 #include "wx/strconv.h"
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT_BASE wxDataInputStream
+class WXDLLIMPEXP_BASE wxDataInputStream

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


@@ -30,8 +26,8 @@ public:
 #else
     wxDataInputStream(wxInputStream& s);
 #endif
 #else
     wxDataInputStream(wxInputStream& s);
 #endif

-    ~wxDataInputStream();
-    
+    ~wxDataInputStream(){}
+

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


@@ -41,6 +37,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 +66,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 

-class WXDLLEXPORT_BASE wxDataOutputStream
+class WXDLLIMPEXP_BASE wxDataOutputStream

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


@@ -72,7 +74,7 @@ public:
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif

-    ~wxDataOutputStream();
+    ~wxDataOutputStream(){}

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


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