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:
@@ -426,7 +426,8 @@ void wxFileConfig::Init()
|
||||
// constructor supports creation of wxFileConfig objects of any type
|
||||
wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
|
||||
const wxString& strLocal, const wxString& strGlobal,
|
||||
long style, wxMBConv& conv)
|
||||
long style,
|
||||
const wxMBConv& conv)
|
||||
: wxConfigBase(::GetAppName(appName), vendorName,
|
||||
strLocal, strGlobal,
|
||||
style),
|
||||
@@ -474,7 +475,7 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
|
||||
wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
|
||||
: m_conv(conv)
|
||||
{
|
||||
// always local_file when this constructor is called (?)
|
||||
@@ -1036,7 +1037,7 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
|
||||
bool wxFileConfig::Save(wxOutputStream& os, wxMBConv& conv)
|
||||
bool wxFileConfig::Save(wxOutputStream& os, const wxMBConv& conv)
|
||||
{
|
||||
// save unconditionally, even if not dirty
|
||||
for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
|
||||
|
Reference in New Issue
Block a user