X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41b0a1139d039c486983ad3ca020217f17fd7414..df7145da50005a9f512d8f3329b6ed2166e956d0:/include/wx/datstrm.h diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index a222f1bc1a..23630e63e2 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -18,13 +18,18 @@ #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,19 @@ public: protected: wxInputStream *m_input; bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif }; 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 +98,9 @@ public: protected: wxOutputStream *m_output; bool m_be_order; +#if wxUSE_UNICODE + wxMBConv& m_conv; +#endif }; #endif