X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10c2f98a3951e534ac608fb801dd44f795733b82..da2e758f83f62cf9ff3bed69aecb8fc00f2583df:/include/wx/datstrm.h?ds=inline diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index c11de7b204..6882bab2a3 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: datstrm.h +// Name: wx/datstrm.h // Purpose: Data stream classes // Author: Guilhem Lavaux // Modified by: Mickael Gilabert @@ -22,7 +22,7 @@ class WXDLLIMPEXP_BASE wxDataInputStream { public: #if wxUSE_UNICODE - wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto()); + wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8 ); #else wxDataInputStream(wxInputStream& s); #endif @@ -78,7 +78,7 @@ public: wxDataInputStream& operator>>(float& f); void BigEndianOrdered(bool be_order) { m_be_order = be_order; } - + #if wxUSE_UNICODE void SetConv( const wxMBConv &conv ); wxMBConv *GetConv() const { return m_conv; } @@ -91,14 +91,14 @@ protected: wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxDataInputStream) + wxDECLARE_NO_COPY_CLASS(wxDataInputStream); }; class WXDLLIMPEXP_BASE wxDataOutputStream { public: #if wxUSE_UNICODE - wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto()); + wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8 ); #else wxDataOutputStream(wxOutputStream& s); #endif @@ -169,7 +169,7 @@ protected: wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxDataOutputStream) + wxDECLARE_NO_COPY_CLASS(wxDataOutputStream); }; #endif