More Motif stuff incl. beginnings of wxToolBar

[wxWidgets.git] / include / wx / textfile.h

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 9999ffdd468438b573f3c344644fa3ce50f765cf..2433f02c58ed01a97dee040af6de31da922716a4 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -33,9 +33,9 @@ public:
   enum Type
   {
     Type_None,  // incomplete (the last line of the file only)
-    Type_Unix,  // line is terminated with 'CR' = 0xA = 10 = '\n'
-    Type_Dos,   //                         'LF' 'CR'
-    Type_Mac    //                         'LF' = 0xD = 12 = '\r'
+    Type_Unix,  // line is terminated with 'LF' = 0xA = 10 = '\n'
+    Type_Dos,   //                         'CR' 'LF'
+    Type_Mac    //                         'CR' = 0xD = 13 = '\r'
   };
 
   // default type for current platform (determined at compile time)
@@ -61,12 +61,33 @@ public:
 
   // accessors
     // get the number of lines in the file
-  size_t    GetLineCount() const { return m_aLines.Count(); }
+  size_t GetLineCount() const { return m_aLines.Count(); }
     // the returned line may be modified (but don't add CR/LF at the end!)
-  wxString& GetLine(uint n)    const { return m_aLines[n]; }
-  wxString& operator[](uint n) const { return m_aLines[n]; }
+  wxString& GetLine(size_t n)    const { return m_aLines[n]; }
+  wxString& operator[](size_t n) const { return m_aLines[n]; }
+
+    // the current line has meaning only when you're using
+    // GetFirstLine()/GetNextLine() functions, it doesn't get updated when
+    // 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(); }
+
+    // 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
+    //     '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& GetPrevLine()  /* const */
+    { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine];   }
+  wxString& GetLastLine() /* const */
+    { return m_aLines[m_nCurLine = m_aLines.Count() - 1]; }
+
     // get the type of the line (see also GetEOL)
-  Type GetLineType(uint n) const { return m_aTypes[n]; }
+  Type GetLineType(size_t n) const { return m_aTypes[n]; }
     // guess the type of file (m_file is supposed to be opened)
   Type GuessType() const;
     // get the name of the file
@@ -77,10 +98,10 @@ public:
   void AddLine(const wxString& str, Type type = typeDefault) 
     { m_aLines.Add(str); m_aTypes.Add(type); }
     // insert a line before the line number n
-  void InsertLine(const wxString& str, uint n, Type type = typeDefault) 
+  void InsertLine(const wxString& str, size_t n, Type type = typeDefault) 
     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line
-  void RemoveLine(uint n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
+  void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
 
   // change the file on disk (default argument means "don't change type")
   // possibly in another format
@@ -97,7 +118,7 @@ public:
 
       default:
         wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
-        return NULL;
+        return (const char *) NULL;
     }
   }
 
@@ -115,8 +136,12 @@ private:
   WX_DEFINE_ARRAY(Type, ArrayFileType);
 
   wxFile        m_file;     // current file
+
   ArrayFileType m_aTypes;   // type of each line
   wxArrayString m_aLines;   // lines of file
+
+  size_t        m_nCurLine; // number of current line in the file
+
   wxString      m_strFile;  // name of the file
 };