X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/769dd0cee1633d22ac9ecb6d4ee676aa15a77403..cc4d5638c66a409e421420ed7110917755a66788:/src/common/textbuf.cpp

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index b6e8362c85..406043e58e 100644
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -3,7 +3,6 @@
 // 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
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,17 +34,12 @@
 // ----------------------------------------------------------------------------
 
 // default type is the native one
-// the native type under Mac OS X is:
-//   - Unix when compiling with the Apple Developer Tools (__UNIX__)
-//   - Mac when compiling with CodeWarrior (__WXMAC__)
 
 const wxTextFileType wxTextBuffer::typeDefault =
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__PALMOS__)
+#if defined(__WINDOWS__) || defined(__DOS__)
   wxTextFileType_Dos;
 #elif defined(__UNIX__)
   wxTextFileType_Unix;
-#elif defined(__WXMAC__)
-  wxTextFileType_Mac;
 #elif defined(__OS2__)
   wxTextFileType_Os2;
 #else
@@ -89,26 +83,26 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
     {
         wxChar ch = *i;
         switch ( ch ) {
-            case _T('\n'):
+            case wxT('\n'):
                 // Dos/Unix line termination
                 result += eol;
                 chLast = 0;
                 break;
 
-            case _T('\r'):
-                if ( chLast == _T('\r') ) {
+            case wxT('\r'):
+                if ( chLast == wxT('\r') ) {
                     // Mac empty line
                     result += eol;
                 }
                 else {
                     // just remember it: we don't know whether it is just "\r"
                     // or "\r\n" yet
-                    chLast = _T('\r');
+                    chLast = wxT('\r');
                 }
                 break;
 
             default:
-                if ( chLast == _T('\r') ) {
+                if ( chLast == wxT('\r') ) {
                     // Mac line termination
                     result += eol;
 
@@ -226,7 +220,7 @@ wxTextFileType wxTextBuffer::GuessType() const
             case wxTextFileType_Unix: nUnix++; break;   \
             case wxTextFileType_Dos:  nDos++;  break;   \
             case wxTextFileType_Mac:  nMac++;  break;   \
-            default: wxFAIL_MSG(_T("unknown line terminator")); \
+            default: wxFAIL_MSG(wxT("unknown line terminator")); \
         }
 
     size_t n;