don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index 2b25b2d470fb29896265d29ca4fe042736d745ab..8da8b294548f7f962d27bd1031a3ae6176ebbdd5 100644 (file)
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -5,14 +5,14 @@
 //              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
 
     #pragma interface "textbuf.h"
 #endif
 


@@ -43,7 +43,9 @@ 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
 


@@ -143,15 +145,15 @@ public:
                   size_t n,
                   wxTextFileType type = typeDefault)
     {
                   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);
     }
 
     // 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
     }
 
     // remove all lines


@@ -188,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