1. changed all "wxMBConv& conv" parameters to "const wxMBConv&"
2. this allows to use wxConvAuto() instead of wxConvUTF8 as default value for this parameter in the classes which read text from the file: wxConvAuto automatically recognizes the BOM at the start of file and uses the correct conversion 3. don't use Windows for UTF-7 conversions as there is no way to make it fail on invalid UTF-7 strings; use our own wxMBConvUtf7 instead git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)
|
||||
wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
|
||||
: m_input(&s), m_be_order(false), m_conv(conv)
|
||||
#else
|
||||
wxDataInputStream::wxDataInputStream(wxInputStream& s)
|
||||
@@ -445,7 +445,7 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
|
||||
wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv)
|
||||
: m_output(&s), m_be_order(false), m_conv(conv)
|
||||
#else
|
||||
wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
|
||||
|
Reference in New Issue
Block a user