Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.

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

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index 2b25b2d470fb29896265d29ca4fe042736d745ab..75c69f2272e08200ca7b066723bbde425edad8ab 100644 (file)
--- 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 wxWindows team
+// Copyright:   (c) 1998-2001 Morten Hanssen, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "textbuf.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/arrstr.h"
 
@@ -43,7 +39,9 @@ enum wxTextFileType
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_EXPORTED_ARRAY_INT(wxTextFileType, ArrayFileType);
+WX_DEFINE_USER_EXPORTED_ARRAY_INT(wxTextFileType,
+                                  wxArrayLinesType,
+                                  class WXDLLIMPEXP_BASE);
 
 #endif // wxUSE_TEXTBUFFER
 
@@ -143,19 +141,19 @@ public:
                   size_t n,
                   wxTextFileType type = typeDefault)
     {
-        m_aLines.insert(m_aLines.begin() + n, str); 
-        m_aTypes.insert(m_aTypes.begin()+n, type); 
+        m_aLines.insert(m_aLines.begin() + n, str);
+        m_aTypes.insert(m_aTypes.begin()+n, type);
     }
 
     // delete one line
     void RemoveLine(size_t n)
     {
         m_aLines.erase(m_aLines.begin() + n);
-        m_aTypes.erase(m_aTypes.begin() + n); 
+        m_aTypes.erase(m_aTypes.begin() + n);
     }
 
     // remove all lines
-    void Clear() { m_aLines.clear(); m_nCurLine = 0; }
+    void Clear() { m_aLines.clear(); m_aTypes.clear(); m_nCurLine = 0; }
 
     // change the buffer (default argument means "don't change type")
     // possibly in another format
@@ -188,8 +186,8 @@ protected:
     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