From 052a4b0f2f5ac473979703d9e0b7d3ae9ef9c12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 6 Nov 2002 13:12:53 +0000 Subject: [PATCH] wxTextFile defaults to iso-8859-1, not wxConvLibc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/textbuf.h | 9 ++++----- include/wx/textfile.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h index c7087c669a..32d8379a0d 100644 --- a/include/wx/textbuf.h +++ b/include/wx/textbuf.h @@ -81,10 +81,10 @@ public: bool Create(const wxString& strBufferName); // 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 - 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 bool Close(); @@ -148,7 +148,7 @@ public: // change the buffer (default argument means "don't change type") // possibly in another format bool Write(wxTextFileType typeNew = wxTextFileType_None, - wxMBConv& conv = wxConvLibc); + wxMBConv& conv = wxConvISO8859_1); // dtor virtual ~wxTextBuffer(); @@ -171,8 +171,7 @@ protected: wxTextBufferOpenMode openmode) = 0; virtual bool OnClose() = 0; virtual bool OnRead(wxMBConv& conv) = 0; - virtual bool OnWrite(wxTextFileType typeNew, - wxMBConv& conv = wxConvLibc) = 0; + virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv) = 0; wxString m_strBufferName; // name of the buffer diff --git a/include/wx/textfile.h b/include/wx/textfile.h index b66afc76c4..43024f64db 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -44,7 +44,7 @@ protected: wxTextBufferOpenMode OpenMode); virtual bool OnClose(); virtual bool OnRead(wxMBConv& conv); - virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv = wxConvLibc); + virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv); private: wxFile m_file;