From 4ae776b767f12af7e0c4f8e64a7848cfd44ada44 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 27 Mar 2006 23:01:00 +0000 Subject: [PATCH] really fixed iteration over wxTextbuffer using GetFirst/NextLine() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/textbuf.h | 14 +++++++++----- src/common/textbuf.cpp | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h index 3dec00b608..5749dd4134 100644 --- a/include/wx/textbuf.h +++ b/include/wx/textbuf.h @@ -114,12 +114,15 @@ public: // NB: const is commented out because not all compilers understand // 'mutable' keyword yet (m_nCurLine should be mutable) - wxString& GetFirstLine() /* const */ { return m_aLines[m_nCurLine = 0]; } - wxString& GetNextLine() /* const */ { return m_aLines[++m_nCurLine]; } + wxString& GetFirstLine() /* const */ + { return m_aLines.empty() ? ms_eof : m_aLines[m_nCurLine = 0]; } + wxString& GetNextLine() /* const */ + { return ++m_nCurLine == m_aLines.size() ? ms_eof + : m_aLines[m_nCurLine]; } wxString& GetPrevLine() /* const */ - { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine]; } + { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine]; } wxString& GetLastLine() /* const */ - { return m_aLines[m_nCurLine = m_aLines.size() - 1]; } + { m_nCurLine = m_aLines.size() - 1; return m_aLines.Last(); } // get the type of the line (see also GetEOL) wxTextFileType GetLineType(size_t n) const { return m_aTypes[n]; } @@ -183,7 +186,8 @@ protected: virtual bool OnRead(wxMBConv& conv) = 0; virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv) = 0; - wxString m_strBufferName; // name of the buffer + static wxString ms_eof; // dummy string returned at EOF + wxString m_strBufferName; // name of the buffer private: wxArrayLinesType m_aTypes; // type of each line diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp index 1891af5b1b..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 // ---------------------------------------------------------------------------- -- 2.45.2