X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550343399aa1355469ffed72c8cf84c732dcf98b..39987096b3aa3e1bec4f69a5793780f7ea2dd914:/src/common/textbuf.cpp diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index f7ca5e0818..b1950d24bc 100644 --- a/src/common/textbuf.cpp +++ b/src/common/textbuf.cpp @@ -132,6 +132,8 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type) #if wxUSE_TEXTBUFFER +wxString wxTextBuffer::ms_eof; + // ---------------------------------------------------------------------------- // ctors & dtor // ---------------------------------------------------------------------------- @@ -248,9 +250,7 @@ wxTextFileType wxTextBuffer::GuessType() const ? wxTextFileType_##t1 \ : wxTextFileType_##t2 - // Watcom C++ doesn't seem to be able to handle the macro - // VS: Watcom 11 doesn't have a problem... -#if !(defined(__WATCOMC__) && (__WATCOMC__ < 1100)) +#if !defined(__WATCOMC__) || wxCHECK_WATCOM_VERSION(1,4) if ( nDos > nUnix ) return GREATER_OF(Dos, Mac); else if ( nDos < nUnix ) @@ -270,9 +270,7 @@ wxTextFileType wxTextBuffer::GuessType() const bool wxTextBuffer::Close() { - m_aTypes.Clear(); - m_aLines.Clear(); - m_nCurLine = 0; + Clear(); m_isOpened = false; return true;