merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -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