Combine two wxImage-to-pixmap creation functions into one.

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

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index f7ca5e081882883ade4d32f6835bcd209dd3eb20..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() );


@@ -248,9 +250,7 @@ wxTextFileType wxTextBuffer::GuessType() const
                                                     ? wxTextFileType_##t1   \
                                                     : wxTextFileType_##t2
 
                                                     ? wxTextFileType_##t1   \
                                                     : wxTextFileType_##t2
 

-        // Watcom C++ doesn't seem to be able to handle the macro
-        // VS: Watcom 11 doesn't have a problem...
-#if !(defined(__WATCOMC__) && (__WATCOMC__ < 1100))
+#if !defined(__WATCOMC__) || wxCHECK_WATCOM_VERSION(1,4)

         if ( nDos > nUnix )
             return GREATER_OF(Dos, Mac);
         else if ( nDos < nUnix )
         if ( nDos > nUnix )
             return GREATER_OF(Dos, Mac);
         else if ( nDos < nUnix )


@@ -270,15 +270,13 @@ wxTextFileType wxTextBuffer::GuessType() const
 
 bool wxTextBuffer::Close()
 {
 
 bool wxTextBuffer::Close()
 {

-    m_aTypes.Clear();
-    m_aLines.Clear();
-    m_nCurLine = 0;
+    Clear();

     m_isOpened = false;
 
     return true;
 }
 
     m_isOpened = false;
 
     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);
 }