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:
@@ -122,11 +122,11 @@ public:
|
||||
const wxString& localFilename = wxEmptyString,
|
||||
const wxString& globalFilename = wxEmptyString,
|
||||
long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE,
|
||||
wxMBConv& conv = wxConvUTF8);
|
||||
const wxMBConv& conv = wxConvAuto());
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
// ctor that takes an input stream.
|
||||
wxFileConfig(wxInputStream &inStream, wxMBConv& conv = wxConvUTF8);
|
||||
wxFileConfig(wxInputStream &inStream, const wxMBConv& conv = wxConvAuto());
|
||||
#endif // wxUSE_STREAMS
|
||||
|
||||
// dtor will save unsaved data
|
||||
@@ -169,7 +169,7 @@ public:
|
||||
// save the entire config file text to the given stream, note that the text
|
||||
// won't be saved again in dtor when Flush() is called if you use this method
|
||||
// as it won't be "changed" any more
|
||||
virtual bool Save(wxOutputStream& os, wxMBConv& conv = wxConvUTF8);
|
||||
virtual bool Save(wxOutputStream& os, const wxMBConv& conv = wxConvAuto());
|
||||
#endif // wxUSE_STREAMS
|
||||
|
||||
public:
|
||||
@@ -227,7 +227,7 @@ private:
|
||||
wxFileConfigGroup *m_pRootGroup, // the top (unnamed) group
|
||||
*m_pCurrentGroup; // the current group
|
||||
|
||||
wxMBConv &m_conv;
|
||||
wxMBConv m_conv;
|
||||
|
||||
#ifdef __UNIX__
|
||||
int m_umask; // the umask to use for file creation
|
||||
|
Reference in New Issue
Block a user