X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..b6e5eaa59701315ca06996ff845872ca4122695f:/include/wx/textfile.h diff --git a/include/wx/textfile.h b/include/wx/textfile.h index b0d4dd9287..6d902976d2 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -79,9 +79,9 @@ public: // same as Create() but with (another) file name bool Create(const wxString& strFile); // Open() also loads file in memory on success - bool Open(); + bool Open(wxMBConv& conv = wxConvLibc); // same as Open() but with (another) file name - bool Open(const wxString& strFile); + bool Open(const wxString& strFile, wxMBConv& conv = wxConvLibc); // closes the file and frees memory, losing all changes bool Close(); // is file currently opened? @@ -131,11 +131,12 @@ public: wxTextFileType type = typeDefault) { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); } // delete one line - void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); } + void RemoveLine(size_t n) { m_aLines.RemoveAt(n); m_aTypes.RemoveAt(n); } // change the file on disk (default argument means "don't change type") // possibly in another format - bool Write(wxTextFileType typeNew = wxTextFileType_None); + bool Write(wxTextFileType typeNew = wxTextFileType_None, + wxMBConv& conv = wxConvLibc); // dtor ~wxTextFile(); @@ -146,7 +147,7 @@ private: wxTextFile& operator=(const wxTextFile&); // read the file in memory (m_file is supposed to be just opened) - bool Read(); + bool Read(wxMBConv& conv); wxFile m_file; // current file