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:
@@ -181,14 +181,14 @@ bool wxTextBuffer::Create()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxTextBuffer::Open(const wxString& strBufferName, wxMBConv& conv)
|
||||
bool wxTextBuffer::Open(const wxString& strBufferName, const wxMBConv& conv)
|
||||
{
|
||||
m_strBufferName = strBufferName;
|
||||
|
||||
return Open(conv);
|
||||
}
|
||||
|
||||
bool wxTextBuffer::Open(wxMBConv& conv)
|
||||
bool wxTextBuffer::Open(const wxMBConv& conv)
|
||||
{
|
||||
// buffer name must be either given in ctor or in Open(const wxString&)
|
||||
wxASSERT( !m_strBufferName.empty() );
|
||||
@@ -276,7 +276,7 @@ bool wxTextBuffer::Close()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxTextBuffer::Write(wxTextFileType typeNew, wxMBConv& conv)
|
||||
bool wxTextBuffer::Write(wxTextFileType typeNew, const wxMBConv& conv)
|
||||
{
|
||||
return OnWrite(typeNew, conv);
|
||||
}
|
||||
|
Reference in New Issue
Block a user