Warning fixes.

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

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 42268b62ed4b0a171248017722f3feb12248a190..0f662f16b339be8f9a4c4a240e621a53b6281027 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -43,7 +43,7 @@
 //   - 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;
@@ -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...
 
-        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");
@@ -77,7 +77,7 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
         return text;
 
     // nor if it is empty
-    if ( text.IsEmpty() )
+    if ( text.empty() )
         return text;
 
     wxString eol = GetEOL(type), result;
@@ -146,6 +146,11 @@ wxTextBuffer::wxTextBuffer(const wxString& strBufferName)
     m_isOpened = false;
 }
 
+wxTextBuffer::~wxTextBuffer()
+{
+    // required here for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // buffer operations
 // ----------------------------------------------------------------------------
@@ -165,7 +170,7 @@ bool wxTextBuffer::Create(const wxString& strBufferName)
 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;
@@ -187,7 +192,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&)
-    wxASSERT( !m_strBufferName.IsEmpty() );
+    wxASSERT( !m_strBufferName.empty() );
 
     // open buffer in read-only mode
     if ( !OnOpen(m_strBufferName, ReadAccess) )