invalidate m_selection in DoRemovePage(), not in DeletePage() (replaces patch 998984)

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

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index 71a72d4c70e053e7a65db0304bd7bfeefda0b694..b0c5dfecd30d466a0d3a5a5b2c73f685c0b0bc6e 100644 (file)
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -5,18 +5,19 @@
 //              differences between platforms.
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
 //              differences between platforms.
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin

-// Copyright:   (c) 1998-2001 wxWindows team
+// Copyright:   (c) 1998-2001 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "textbuf.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "textbuf.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/arrstr.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -42,11 +43,13 @@ enum wxTextFileType
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 

-WX_DEFINE_EXPORTED_ARRAY_INT(wxTextFileType, ArrayFileType);
+WX_DEFINE_USER_EXPORTED_ARRAY_INT(wxTextFileType,
+                                  wxArrayLinesType,
+                                  class WXDLLIMPEXP_BASE);

 
 #endif // wxUSE_TEXTBUFFER
 
 
 #endif // wxUSE_TEXTBUFFER
 

-class WXDLLEXPORT wxTextBuffer
+class WXDLLIMPEXP_BASE wxTextBuffer

 {
 public:
     // constants and static functions
 {
 public:
     // constants and static functions


@@ -96,18 +99,18 @@ public:
     // ---------
 
     // get the number of lines in the buffer
     // ---------
 
     // get the number of lines in the buffer

-    size_t GetLineCount() const { return m_aLines.Count(); }
+    size_t GetLineCount() const { return m_aLines.size(); }

 
     // the returned line may be modified (but don't add CR/LF at the end!)
 
     // the returned line may be modified (but don't add CR/LF at the end!)

-    wxString& GetLine(size_t n)    const { return m_aLines[n]; }
-    wxString& operator[](size_t n) const { return m_aLines[n]; }
+    wxString& GetLine(size_t n)    const { return (wxString&)m_aLines[n]; }
+    wxString& operator[](size_t n) const { return (wxString&)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; }
 
     // 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_aLines.Count() == 0 || m_nCurLine == m_aLines.Count() - 1); }
+    bool Eof() const { return (m_aLines.size() == 0 || m_nCurLine == m_aLines.size() - 1); }

 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:
 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:


@@ -120,7 +123,7 @@ public:
     wxString& GetPrevLine()  /* const */
         { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine];   }
     wxString& GetLastLine() /* const */
     wxString& GetPrevLine()  /* const */
         { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine];   }
     wxString& GetLastLine() /* const */

-        { return m_aLines[m_nCurLine = m_aLines.Count() - 1]; }
+        { return m_aLines[m_nCurLine = m_aLines.size() - 1]; }

 
     // get the type of the line (see also GetEOL)
     wxTextFileType GetLineType(size_t n) const { return m_aTypes[n]; }
 
     // get the type of the line (see also GetEOL)
     wxTextFileType GetLineType(size_t n) const { return m_aTypes[n]; }


@@ -136,17 +139,25 @@ public:
 
     // add a line to the end
     void AddLine(const wxString& str, wxTextFileType type = typeDefault)
 
     // add a line to the end
     void AddLine(const wxString& str, wxTextFileType type = typeDefault)

-        { m_aLines.Add(str); m_aTypes.Add(type); }
+        { m_aLines.push_back(str); m_aTypes.push_back(type); }

     // insert a line before the line number n
     void InsertLine(const wxString& str,
                   size_t n,
                   wxTextFileType type = typeDefault)
     // insert a line before the line number n
     void InsertLine(const wxString& str,
                   size_t n,
                   wxTextFileType type = typeDefault)

-        { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
+    {
+        m_aLines.insert(m_aLines.begin() + n, str); 
+        m_aTypes.insert(m_aTypes.begin()+n, type); 
+    }
+

     // delete one line
     // delete one line

-    void RemoveLine(size_t n) { m_aLines.RemoveAt(n); m_aTypes.RemoveAt(n); }
+    void RemoveLine(size_t n)
+    {
+        m_aLines.erase(m_aLines.begin() + n);
+        m_aTypes.erase(m_aTypes.begin() + n); 
+    }

 
     // remove all lines
 
     // remove all lines

-    void Clear() { m_aLines.Clear(); m_nCurLine = 0; }
+    void Clear() { m_aLines.clear(); m_nCurLine = 0; }

 
     // change the buffer (default argument means "don't change type")
     // possibly in another format
 
     // change the buffer (default argument means "don't change type")
     // possibly in another format


@@ -179,8 +190,8 @@ protected:
     wxString m_strBufferName;  // name of the buffer
 
 private:
     wxString m_strBufferName;  // name of the buffer
 
 private:

-    ArrayFileType m_aTypes;   // type of each line
-    wxArrayString m_aLines;   // lines of file
+    wxArrayLinesType m_aTypes;   // type of each line
+    wxArrayString    m_aLines;   // lines of file

 
     size_t        m_nCurLine; // number of current line in the buffer
 
 
     size_t        m_nCurLine; // number of current line in the buffer