Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxTextFile defaults to iso-8859-1, not wxConvLibc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-06 13:12:53 +00:00
parent 1aa3e8d8f6
commit 052a4b0f2f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/textbuf.h
View File

@@ -81,10 +81,10 @@ public:
bool Create(const wxString& strBufferName); bool Create(const wxString& strBufferName);
// Open() also loads buffer in memory on success // Open() also loads buffer in memory on success
bool Open(wxMBConv& conv = wxConvLibc); bool Open(wxMBConv& conv = wxConvISO8859_1);
// same as Open() but with (another) buffer name // same as Open() but with (another) buffer name
bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvLibc); bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvISO8859_1);
// closes the buffer and frees memory, losing all changes // closes the buffer and frees memory, losing all changes
bool Close(); bool Close();
@@ -148,7 +148,7 @@ public:
// change the buffer (default argument means "don't change type") // change the buffer (default argument means "don't change type")
// possibly in another format // possibly in another format
bool Write(wxTextFileType typeNew = wxTextFileType_None, bool Write(wxTextFileType typeNew = wxTextFileType_None,
wxMBConv& conv = wxConvLibc); wxMBConv& conv = wxConvISO8859_1);
// dtor // dtor
virtual ~wxTextBuffer(); virtual ~wxTextBuffer();
@@ -171,8 +171,7 @@ protected:
wxTextBufferOpenMode openmode) = 0; wxTextBufferOpenMode openmode) = 0;
virtual bool OnClose() = 0; virtual bool OnClose() = 0;
virtual bool OnRead(wxMBConv& conv) = 0; virtual bool OnRead(wxMBConv& conv) = 0;
virtual bool OnWrite(wxTextFileType typeNew, virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv) = 0;
wxMBConv& conv = wxConvLibc) = 0;
wxString m_strBufferName; // name of the buffer wxString m_strBufferName; // name of the buffer

2
include/wx/textfile.h
View File

@@ -44,7 +44,7 @@ protected:
wxTextBufferOpenMode OpenMode); wxTextBufferOpenMode OpenMode);
virtual bool OnClose(); virtual bool OnClose();
virtual bool OnRead(wxMBConv& conv); virtual bool OnRead(wxMBConv& conv);
virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv = wxConvLibc); virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv);
private: private:
wxFile m_file; wxFile m_file;