fix compilation when one of wxUSE_LISTCTRL and wxUSE_TREECTRL is defined but the...

[wxWidgets.git] / src / common / textbuf.cpp

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 1891af5b1be7fe09aed6c5ce43f060f992471632..2aa823d9b3511deef6ce03dca404c0f0826a266b 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -132,6 +132,8 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
 
 #if wxUSE_TEXTBUFFER
 
 
 #if wxUSE_TEXTBUFFER
 

+wxString wxTextBuffer::ms_eof;
+

 // ----------------------------------------------------------------------------
 // ctors & dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctors & dtor
 // ----------------------------------------------------------------------------


@@ -179,14 +181,14 @@ bool wxTextBuffer::Create()
     return true;
 }
 
     return true;
 }
 

-bool wxTextBuffer::Open(const wxString& strBufferName, wxMBConv& conv)
+bool wxTextBuffer::Open(const wxString& strBufferName, const wxMBConv& conv)

 {
     m_strBufferName = strBufferName;
 
     return Open(conv);
 }
 
 {
     m_strBufferName = strBufferName;
 
     return Open(conv);
 }
 

-bool wxTextBuffer::Open(wxMBConv& conv)
+bool wxTextBuffer::Open(const wxMBConv& conv)

 {
     // buffer name must be either given in ctor or in Open(const wxString&)
     wxASSERT( !m_strBufferName.empty() );
 {
     // buffer name must be either given in ctor or in Open(const wxString&)
     wxASSERT( !m_strBufferName.empty() );


@@ -274,7 +276,7 @@ bool wxTextBuffer::Close()
     return true;
 }
 
     return true;
 }
 

-bool wxTextBuffer::Write(wxTextFileType typeNew, wxMBConv& conv)
+bool wxTextBuffer::Write(wxTextFileType typeNew, const wxMBConv& conv)

 {
     return OnWrite(typeNew, conv);
 }
 {
     return OnWrite(typeNew, conv);
 }