some compilers don't like statics in inline functions, even if they're const -- repla...

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

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 629976253e35bf55c84e54389812c3910f487fe6..0f662f16b339be8f9a4c4a240e621a53b6281027 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -3,15 +3,15 @@
 // 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

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

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 

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

     #pragma implementation "textbuf.h"
 #endif
 
     #pragma implementation "textbuf.h"
 #endif
 


@@ -43,7 +43,7 @@
 //   - 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;
   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;


@@ -63,7 +63,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 +77,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;


@@ -143,11 +143,12 @@ wxTextBuffer::wxTextBuffer(const wxString& strBufferName)
             : m_strBufferName(strBufferName)
 {
     m_nCurLine = 0;
             : m_strBufferName(strBufferName)
 {
     m_nCurLine = 0;

-    m_isOpened = FALSE;
+    m_isOpened = false;

 }
 
 wxTextBuffer::~wxTextBuffer()
 {
 }
 
 wxTextBuffer::~wxTextBuffer()
 {

+    // required here for Darwin

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -169,16 +170,16 @@ 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 the buffer already exists do nothing

-    if ( Exists() ) return FALSE;
-  
+    if ( Exists() ) return false;
+

     if ( !OnOpen(m_strBufferName, WriteAccess) )
     if ( !OnOpen(m_strBufferName, WriteAccess) )

-        return FALSE;
+        return false;

 
     OnClose();
 
     OnClose();

-    return TRUE;
+    return true;

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


@@ -191,11 +192,11 @@ 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) )

-        return FALSE;
+        return false;

 
     // read buffer into memory
     m_isOpened = OnRead(conv);
 
     // read buffer into memory
     m_isOpened = OnRead(conv);


@@ -275,9 +276,9 @@ bool wxTextBuffer::Close()
     m_aTypes.Clear();
     m_aLines.Clear();
     m_nCurLine = 0;
     m_aTypes.Clear();
     m_aLines.Clear();
     m_nCurLine = 0;

-    m_isOpened = FALSE;
+    m_isOpened = false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextBuffer::Write(wxTextFileType typeNew, wxMBConv& conv)
 }
 
 bool wxTextBuffer::Write(wxTextFileType typeNew, wxMBConv& conv)