Committing in .

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

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index f5a44afe68321cb2ea222bd244a2718c5dc0ecb8..71a72d4c70e053e7a65db0304bd7bfeefda0b694 100644 (file)
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -6,13 +6,13 @@
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
 // Copyright:   (c) 1998-2001 wxWindows team
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
 // Copyright:   (c) 1998-2001 wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTBUFFER_H
 #define _WX_TEXTBUFFER_H
 

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

     #pragma interface "textbuf.h"
 #endif
 
     #pragma interface "textbuf.h"
 #endif
 


@@ -42,7 +42,7 @@ enum wxTextFileType
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 
 // wxTextBuffer
 // ----------------------------------------------------------------------------
 

-WX_DEFINE_EXPORTED_ARRAY(wxTextFileType, ArrayFileType);
+WX_DEFINE_EXPORTED_ARRAY_INT(wxTextFileType, ArrayFileType);

 
 #endif // wxUSE_TEXTBUFFER
 
 
 #endif // wxUSE_TEXTBUFFER
 


@@ -81,10 +81,10 @@ public:
     bool Create(const wxString& strBufferName);
 
     // Open() also loads buffer in memory on success
     bool Create(const wxString& strBufferName);
 
     // Open() also loads buffer in memory on success

-    bool Open(wxMBConv& conv = wxConvLibc);
+    bool Open(wxMBConv& conv = wxConvUTF8);

 
     // same as Open() but with (another) buffer name
 
     // same as Open() but with (another) buffer name

-    bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvLibc);
+    bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvUTF8);

 
     // closes the buffer and frees memory, losing all changes
     bool Close();
 
     // closes the buffer and frees memory, losing all changes
     bool Close();


@@ -145,10 +145,13 @@ public:
     // delete one line
     void RemoveLine(size_t n) { m_aLines.RemoveAt(n); m_aTypes.RemoveAt(n); }
 
     // delete one line
     void RemoveLine(size_t n) { m_aLines.RemoveAt(n); m_aTypes.RemoveAt(n); }
 

+    // remove all lines
+    void Clear() { m_aLines.Clear(); m_nCurLine = 0; }
+

     // change the buffer (default argument means "don't change type")
     // possibly in another format
     bool Write(wxTextFileType typeNew = wxTextFileType_None,
     // change the buffer (default argument means "don't change type")
     // possibly in another format
     bool Write(wxTextFileType typeNew = wxTextFileType_None,

-               wxMBConv& conv = wxConvLibc);
+               wxMBConv& conv = wxConvUTF8);

 
     // dtor
     virtual ~wxTextBuffer();
 
     // dtor
     virtual ~wxTextBuffer();


@@ -158,7 +161,7 @@ protected:
     // -----
 
     // default ctor, use Open(string)
     // -----
 
     // default ctor, use Open(string)

-    wxTextBuffer() { }
+    wxTextBuffer() { m_isOpened = false; }

 
     // ctor from filename
     wxTextBuffer(const wxString& strBufferName);
 
     // ctor from filename
     wxTextBuffer(const wxString& strBufferName);


@@ -171,8 +174,7 @@ protected:
                         wxTextBufferOpenMode openmode) = 0;
     virtual bool OnClose() = 0;
     virtual bool OnRead(wxMBConv& conv) = 0;
                         wxTextBufferOpenMode openmode) = 0;
     virtual bool OnClose() = 0;
     virtual bool OnRead(wxMBConv& conv) = 0;

-    virtual bool OnWrite(wxTextFileType typeNew,
-                        wxMBConv& conv = wxConvLibc) = 0;
+    virtual bool OnWrite(wxTextFileType typeNew, wxMBConv& conv) = 0;

 
     wxString m_strBufferName;  // name of the buffer
 
 
     wxString m_strBufferName;  // name of the buffer