Use wxClientDataDictionary for client data.

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index a222f1bc1aa48112e354e474819745448bef9fed..0551b437cc346e55dd30fe6c5c934650d3c097ad 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -12,19 +12,24 @@
 #ifndef _WX_DATSTREAM_H_
 #define _WX_DATSTREAM_H_
 
 #ifndef _WX_DATSTREAM_H_
 #define _WX_DATSTREAM_H_
 

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

 #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
 
 class WXDLLEXPORT wxDataInputStream
 {
 public:
 
 #if wxUSE_STREAMS
 
 class WXDLLEXPORT wxDataInputStream
 {
 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(); }


@@ -52,12 +57,19 @@ public:
 protected:
     wxInputStream *m_input;
     bool m_be_order;
 protected:
     wxInputStream *m_input;
     bool m_be_order;

+#if wxUSE_UNICODE
+    wxMBConv& m_conv;
+#endif

 };
 
 class WXDLLEXPORT wxDataOutputStream
 {
 public:
 };
 
 class WXDLLEXPORT wxDataOutputStream
 {
 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(); }


@@ -86,6 +98,9 @@ public:
 protected:
     wxOutputStream *m_output;
     bool m_be_order;
 protected:
     wxOutputStream *m_output;
     bool m_be_order;

+#if wxUSE_UNICODE
+    wxMBConv& m_conv;
+#endif

 };
 
 #endif
 };
 
 #endif