X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c23894955325535bf603be74a3c0dc8d3fce65ab..29f538cea2cfcbb272ca724f8dbf778207530033:/include/wx/textfile.h

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 4aefef1e5a..b6132bd178 100644
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -4,7 +4,7 @@
 //              (file is fully loaded in memory) and which understands CR/LF
 //              differences between platforms.
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -47,7 +47,7 @@ public:
   // ctors
     // def ctor, use Open(string)
   wxTextFile() { }
-    // 
+    //
   wxTextFile(const wxString& strFile);
 
   // file operations
@@ -74,13 +74,13 @@ 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_nCurLine == m_aLines.Count(); }
+  bool Eof() const { return m_nCurLine == m_aLines.Count() - 1; }
 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:
     //  for ( str = GetFirstLine(); !Eof(); str = GetNextLine() ) { ... }
 
-    // @@@ const is commented out because not all compilers understand
+    // 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];   }
@@ -94,16 +94,16 @@ public:
     // guess the type of file (m_file is supposed to be opened)
   wxTextFileType GuessType() const;
     // get the name of the file
-  const char *GetName() const { return m_strFile.c_str(); }
+  const wxChar *GetName() const { return m_strFile.c_str(); }
 
   // add/remove lines
     // add a line to the end
-  void AddLine(const wxString& str, wxTextFileType type = typeDefault) 
+  void AddLine(const wxString& str, wxTextFileType type = typeDefault)
     { m_aLines.Add(str); m_aTypes.Add(type); }
     // insert a line before the line number n
   void InsertLine(const wxString& str,
                   size_t n,
-                  wxTextFileType type = typeDefault) 
+                  wxTextFileType type = typeDefault)
     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line
   void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
@@ -114,7 +114,7 @@ public:
 
   // get the file termination string
   // Note: implementation moved to textfile to prevent warning due to switch.
-  static const char *GetEOL(wxTextFileType type = typeDefault);
+  static const wxChar *GetEOL(wxTextFileType type = typeDefault);
 
   // dtor
   ~wxTextFile();