fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h
index f768a5632471fbc2f11fd508fbc9fa5b6b49f0c5..a2511b427d59a918b7c280024f697e3fed7ee64f 100644 (file)
--- a/include/wx/textbuf.h
+++ b/include/wx/textbuf.h
@@ -20,7 +20,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// the line termination type (kept wxTextFileType name for compability)
+// the line termination type (kept wxTextFileType name for compatibility)

 enum wxTextFileType
 {
     wxTextFileType_None,  // incomplete (the last line of the file only)
 enum wxTextFileType
 {
     wxTextFileType_None,  // incomplete (the last line of the file only)


@@ -99,8 +99,10 @@ public:
     size_t GetLineCount() const { return m_aLines.size(); }
 
     // the returned line may be modified (but don't add CR/LF at the end!)
     size_t GetLineCount() const { return m_aLines.size(); }
 
     // the returned line may be modified (but don't add CR/LF at the end!)

-    wxString& GetLine(size_t n)    const { return (wxString&)m_aLines[n]; }
-    wxString& operator[](size_t n) const { return (wxString&)m_aLines[n]; }
+          wxString& GetLine(size_t n)          { return m_aLines[n]; }
+    const wxString& GetLine(size_t n)    const { return m_aLines[n]; }
+          wxString& operator[](size_t n)       { return m_aLines[n]; }
+    const 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
 
     // the current line has meaning only when you're using
     // GetFirstLine()/GetNextLine() functions, it doesn't get updated when


@@ -132,7 +134,7 @@ public:
     wxTextFileType GuessType() const;
 
     // get the name of the buffer
     wxTextFileType GuessType() const;
 
     // get the name of the buffer

-    const wxChar *GetName() const { return m_strBufferName.c_str(); }
+    const wxString& GetName() const { return m_strBufferName; }

 
     // add/remove lines
     // ----------------
 
     // add/remove lines
     // ----------------


@@ -172,7 +174,7 @@ protected:
     // -----
 
     // default ctor, use Open(string)
     // -----
 
     // default ctor, use Open(string)

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

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