Warning fix.

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

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 42268b62ed4b0a171248017722f3feb12248a190..b1950d24bc4590902a1c1b84fa9c90b1fdf8efbe 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -3,6 +3,7 @@
 // Purpose:     implementation of wxTextBuffer class
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin
 // Purpose:     implementation of wxTextBuffer class
 // Created:     14.11.01
 // Author:      Morten Hanssen, Vadim Zeitlin

+// RCS-ID:      $Id$

 // Copyright:   (c) 1998-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,10 +12,6 @@
 // headers
 // ============================================================================
 
 // headers
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "textbuf.h"
-#endif
-

 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -43,13 +40,13 @@
 //   - Mac when compiling with CodeWarrior (__WXMAC__)
 
 const wxTextFileType wxTextBuffer::typeDefault =
 //   - Mac when compiling with CodeWarrior (__WXMAC__)
 
 const wxTextFileType wxTextBuffer::typeDefault =

-#if defined(__WINDOWS__) || defined(__DOS__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__PALMOS__)

   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;
 #elif defined(__WXMAC__)
   wxTextFileType_Mac;
   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;
 #elif defined(__WXMAC__)
   wxTextFileType_Mac;

-#elif defined(__WXPM__)
+#elif defined(__OS2__)

   wxTextFileType_Os2;
 #else
   wxTextFileType_None;
   wxTextFileType_Os2;
 #else
   wxTextFileType_None;


@@ -63,7 +60,7 @@ const wxChar *wxTextBuffer::GetEOL(wxTextFileType type)
             wxFAIL_MSG(wxT("bad buffer type in wxTextBuffer::GetEOL."));
             // fall through nevertheless - we must return something...
 
             wxFAIL_MSG(wxT("bad buffer type in wxTextBuffer::GetEOL."));
             // fall through nevertheless - we must return something...
 

-        case wxTextFileType_None: return wxT("");
+        case wxTextFileType_None: return wxEmptyString;

         case wxTextFileType_Unix: return wxT("\n");
         case wxTextFileType_Dos:  return wxT("\r\n");
         case wxTextFileType_Mac:  return wxT("\r");
         case wxTextFileType_Unix: return wxT("\n");
         case wxTextFileType_Dos:  return wxT("\r\n");
         case wxTextFileType_Mac:  return wxT("\r");


@@ -77,7 +74,7 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
         return text;
 
     // nor if it is empty
         return text;
 
     // nor if it is empty

-    if ( text.IsEmpty() )
+    if ( text.empty() )

         return text;
 
     wxString eol = GetEOL(type), result;
         return text;
 
     wxString eol = GetEOL(type), result;


@@ -135,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
 // ----------------------------------------------------------------------------


@@ -146,6 +145,11 @@ wxTextBuffer::wxTextBuffer(const wxString& strBufferName)
     m_isOpened = false;
 }
 
     m_isOpened = false;
 }
 

+wxTextBuffer::~wxTextBuffer()
+{
+    // required here for Darwin
+}
+

 // ----------------------------------------------------------------------------
 // buffer operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // buffer operations
 // ----------------------------------------------------------------------------


@@ -165,7 +169,7 @@ bool wxTextBuffer::Create(const wxString& strBufferName)
 bool wxTextBuffer::Create()
 {
     // buffer name must be either given in ctor or in Create(const wxString&)
 bool wxTextBuffer::Create()
 {
     // buffer name must be either given in ctor or in Create(const wxString&)

-    wxASSERT( !m_strBufferName.IsEmpty() );
+    wxASSERT( !m_strBufferName.empty() );

 
     // if the buffer already exists do nothing
     if ( Exists() ) return false;
 
     // if the buffer already exists do nothing
     if ( Exists() ) return false;


@@ -187,7 +191,7 @@ bool wxTextBuffer::Open(const wxString& strBufferName, wxMBConv& conv)
 bool wxTextBuffer::Open(wxMBConv& conv)
 {
     // buffer name must be either given in ctor or in Open(const wxString&)
 bool wxTextBuffer::Open(wxMBConv& conv)
 {
     // buffer name must be either given in ctor or in Open(const wxString&)

-    wxASSERT( !m_strBufferName.IsEmpty() );
+    wxASSERT( !m_strBufferName.empty() );

 
     // open buffer in read-only mode
     if ( !OnOpen(m_strBufferName, ReadAccess) )
 
     // open buffer in read-only mode
     if ( !OnOpen(m_strBufferName, ReadAccess) )


@@ -246,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 )


@@ -268,9 +270,7 @@ 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;


@@ -282,4 +282,3 @@ bool wxTextBuffer::Write(wxTextFileType typeNew, wxMBConv& conv)
 }
 
 #endif // wxUSE_TEXTBUFFER
 }
 
 #endif // wxUSE_TEXTBUFFER

-