X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41b0a1139d039c486983ad3ca020217f17fd7414..da0766ab2ae2357cd4dc111415731ee85aa45984:/include/wx/datstrm.h diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index a222f1bc1a..00e35884d7 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -6,25 +6,30 @@ // 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_ -#ifdef __GNUG__ +#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 class WXDLLEXPORT wxDataInputStream { public: +#if wxUSE_UNICODE + wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8); +#else wxDataInputStream(wxInputStream& s); +#endif ~wxDataInputStream(); bool IsOk() { return m_input->IsOk(); } @@ -52,12 +57,21 @@ public: protected: wxInputStream *m_input; bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif + + DECLARE_NO_COPY_CLASS(wxDataInputStream) }; class WXDLLEXPORT wxDataOutputStream { public: +#if wxUSE_UNICODE + wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8); +#else wxDataOutputStream(wxOutputStream& s); +#endif ~wxDataOutputStream(); bool IsOk() { return m_output->IsOk(); } @@ -86,6 +100,11 @@ public: protected: wxOutputStream *m_output; bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif + + DECLARE_NO_COPY_CLASS(wxDataOutputStream) }; #endif