Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 7551c3c24b9ddf9f638f5f51ba4a242490ca0abc..477da30ec65d740714abfe65d2376b4e257d7bfa 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        datstrm.h
+// Name:        wx/datstrm.h

 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mickael Gilabert
 // Created:     28/06/1998
 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mickael Gilabert
 // Created:     28/06/1998

-// RCS-ID:      $Id$

 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,34 +13,101 @@
 
 #include "wx/stream.h"
 #include "wx/longlong.h"
 
 #include "wx/stream.h"
 #include "wx/longlong.h"

-#include "wx/strconv.h"
+#include "wx/convauto.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLIMPEXP_BASE wxDataInputStream
+// Common wxDataInputStream and wxDataOutputStream parameters.
+class WXDLLIMPEXP_BASE wxDataStreamBase

 {
 public:
 {
 public:

+    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
+
+    // By default we use extended precision (80 bit) format for both float and
+    // doubles. Call this function to switch to alternative representation in
+    // which IEEE 754 single precision (32 bits) is used for floats and double
+    // precision (64 bits) is used for doubles.
+    void UseBasicPrecisions()
+    {
+#if wxUSE_APPLE_IEEE
+        m_useExtendedPrecision = false;
+#endif // wxUSE_APPLE_IEEE
+    }
+
+    // UseExtendedPrecision() is not very useful as it corresponds to the
+    // default value, only call it in your code if you want the compilation
+    // fail with the error when using wxWidgets library compiled without
+    // extended precision support.
+#if wxUSE_APPLE_IEEE
+    void UseExtendedPrecision()
+    {
+        m_useExtendedPrecision = true;
+    }
+#endif // wxUSE_APPLE_IEEE
+
+#if wxUSE_UNICODE
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
+#endif
+
+protected:
+    // Ctor and dtor are both protected, this class is never used directly but
+    // only by its derived classes.
+    wxDataStreamBase(const wxMBConv& conv);
+    ~wxDataStreamBase();
+
+
+    bool m_be_order;
+
+#if wxUSE_APPLE_IEEE
+    bool m_useExtendedPrecision;
+#endif // wxUSE_APPLE_IEEE
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8);
-#else
-    wxDataInputStream(wxInputStream& s);
+    wxMBConv *m_conv;

 #endif
 #endif

-    ~wxDataInputStream(){}
+
+    wxDECLARE_NO_COPY_CLASS(wxDataStreamBase);
+};
+
+
+class WXDLLIMPEXP_BASE wxDataInputStream : public wxDataStreamBase
+{
+public:
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8);

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

+#if wxHAS_INT64

     wxUint64 Read64();
     wxUint64 Read64();

+#endif
+#if wxUSE_LONGLONG
+    wxLongLong ReadLL();
+#endif

     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();
     double ReadDouble();
     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();
     double ReadDouble();

+    float ReadFloat();

     wxString ReadString();
 
     wxString ReadString();
 

+#if wxHAS_INT64

     void Read64(wxUint64 *buffer, size_t size);
     void Read64(wxUint64 *buffer, size_t size);

+    void Read64(wxInt64 *buffer, size_t size);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    void Read64(wxULongLong *buffer, size_t size);
+    void Read64(wxLongLong *buffer, size_t size);
+#endif
+#if wxUSE_LONGLONG
+    void ReadLL(wxULongLong *buffer, size_t size);
+    void ReadLL(wxLongLong *buffer, size_t size);
+#endif

     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);
     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);

+    void ReadFloat(float *buffer, size_t size);

 
     wxDataInputStream& operator>>(wxString& s);
     wxDataInputStream& operator>>(wxInt8& c);
 
     wxDataInputStream& operator>>(wxString& s);
     wxDataInputStream& operator>>(wxInt8& c);


@@ -50,48 +116,63 @@ public:
     wxDataInputStream& operator>>(wxUint8& c);
     wxDataInputStream& operator>>(wxUint16& i);
     wxDataInputStream& operator>>(wxUint32& i);
     wxDataInputStream& operator>>(wxUint8& c);
     wxDataInputStream& operator>>(wxUint16& i);
     wxDataInputStream& operator>>(wxUint32& i);

+#if wxHAS_INT64

     wxDataInputStream& operator>>(wxUint64& i);
     wxDataInputStream& operator>>(wxUint64& i);

-    wxDataInputStream& operator>>(double& i);
+    wxDataInputStream& operator>>(wxInt64& i);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    wxDataInputStream& operator>>(wxULongLong& i);
+    wxDataInputStream& operator>>(wxLongLong& i);
+#endif
+    wxDataInputStream& operator>>(double& d);

     wxDataInputStream& operator>>(float& f);
 
     wxDataInputStream& operator>>(float& f);
 

-    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
-

 protected:
     wxInputStream *m_input;
 protected:
     wxInputStream *m_input;

-    bool m_be_order;
-#if wxUSE_UNICODE
-    wxMBConv& m_conv;
-#endif

 
 

-    DECLARE_NO_COPY_CLASS(wxDataInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataInputStream);

 };
 
 };
 

-class WXDLLIMPEXP_BASE wxDataOutputStream
+class WXDLLIMPEXP_BASE wxDataOutputStream : public wxDataStreamBase

 {
 public:
 {
 public:

-#if wxUSE_UNICODE
-    wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8);
-#else
-    wxDataOutputStream(wxOutputStream& s);
-#endif
-    ~wxDataOutputStream(){}
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8);

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

+#if wxHAS_INT64

     void Write64(wxUint64 i);
     void Write64(wxUint64 i);

+    void Write64(wxInt64 i);
+#endif
+#if wxUSE_LONGLONG
+    void WriteLL(const wxLongLong &ll);
+    void WriteLL(const wxULongLong &ll);
+#endif

     void Write32(wxUint32 i);
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);
     void WriteDouble(double d);
     void Write32(wxUint32 i);
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);
     void WriteDouble(double d);

+    void WriteFloat(float f);

     void WriteString(const wxString& string);
 
     void WriteString(const wxString& string);
 

+#if wxHAS_INT64

     void Write64(const wxUint64 *buffer, size_t size);
     void Write64(const wxUint64 *buffer, size_t size);

+    void Write64(const wxInt64 *buffer, size_t size);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    void Write64(const wxULongLong *buffer, size_t size);
+    void Write64(const wxLongLong *buffer, size_t size);
+#endif
+#if wxUSE_LONGLONG
+    void WriteLL(const wxULongLong *buffer, size_t size);
+    void WriteLL(const wxLongLong *buffer, size_t size);
+#endif

     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);
     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);

+    void WriteFloat(const float *buffer, size_t size);

 
 

-    wxDataOutputStream& operator<<(const wxChar *string);

     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);


@@ -99,20 +180,21 @@ public:
     wxDataOutputStream& operator<<(wxUint8 c);
     wxDataOutputStream& operator<<(wxUint16 i);
     wxDataOutputStream& operator<<(wxUint32 i);
     wxDataOutputStream& operator<<(wxUint8 c);
     wxDataOutputStream& operator<<(wxUint16 i);
     wxDataOutputStream& operator<<(wxUint32 i);

+#if wxHAS_INT64

     wxDataOutputStream& operator<<(wxUint64 i);
     wxDataOutputStream& operator<<(wxUint64 i);

-    wxDataOutputStream& operator<<(double f);
+    wxDataOutputStream& operator<<(wxInt64 i);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    wxDataOutputStream& operator<<(const wxULongLong &i);
+    wxDataOutputStream& operator<<(const wxLongLong &i);
+#endif
+    wxDataOutputStream& operator<<(double d);

     wxDataOutputStream& operator<<(float f);
 
     wxDataOutputStream& operator<<(float f);
 

-    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
-

 protected:
     wxOutputStream *m_output;
 protected:
     wxOutputStream *m_output;

-    bool m_be_order;
-#if wxUSE_UNICODE
-    wxMBConv& m_conv;
-#endif

 
 

-    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);

 };
 
 #endif
 };
 
 #endif