X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8397cab4dafee82a887785a80ab8f588a68d9f27..7ef3ab50e9705c2724f74ef4fb275030d6fbe589:/include/wx/textbuf.h

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index f6ca9dcfb9..5749dd4134 100644
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -5,17 +5,13 @@
 //              differences between platforms.
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
-// Copyright:   (c) 1998-2001 wxWidgets team
+// Copyright:   (c) 1998-2001 Morten Hanssen, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textbuf.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/arrstr.h"
 
@@ -110,7 +106,7 @@ public:
     // you're using "direct access" i.e. GetLine()
     size_t GetCurrentLine() const { return m_nCurLine; }
     void GoToLine(size_t n) { m_nCurLine = n; }
-    bool Eof() const { return (m_aLines.size() == 0 || m_nCurLine == m_aLines.size() - 1); }
+    bool Eof() const { return m_nCurLine == m_aLines.size(); }
 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:
@@ -118,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]; }
@@ -187,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