X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..89894079c04bba0ab2fd9efcb421516fc90545cb:/src/common/textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 95dd05b357..3ab5dc94c3 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -64,17 +64,16 @@ const wxChar *wxTextFile::GetEOL(wxTextFileType type)
 {
     switch ( type ) {
       default:
-        wxFAIL_MSG(T("bad file type in wxTextFile::GetEOL."));
+        wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL."));
         // fall through nevertheless - we must return something...
 
-      case wxTextFileType_None: return T("");
-      case wxTextFileType_Unix: return T("\n");
-      case wxTextFileType_Dos:  return T("\r\n");
-      case wxTextFileType_Mac:  return T("\r");
+      case wxTextFileType_None: return wxT(_T(""));
+      case wxTextFileType_Unix: return wxT(_T("\n"));
+      case wxTextFileType_Dos:  return wxT(_T("\r\n"));
+      case wxTextFileType_Mac:  return wxT(_T("\r"));
     }
 }
 
-
 wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
 {
     // don't do anything if there is nothing to do
@@ -93,34 +92,40 @@ wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
     {
         wxChar ch = *pc;
         switch ( ch ) {
-            case '\n':
+            case _T('\n'):
                 // Dos/Unix line termination
                 result += eol;
-                chLast = '\n';
+                chLast = 0;
                 break;
 
-            case '\r':
-                if ( chLast == '\r' ) {
+            case _T('\r'):
+                if ( chLast == _T('\r') ) {
                     // Mac empty line
                     result += eol;
                 }
-                else
-                    chLast = '\r';
+                else {
+                    // just remember it: we don't know whether it is just "\r"
+                    // or "\r\n" yet
+                    chLast = _T('\r');
+                }
                 break;
 
             default:
-                if ( chLast == '\r' ) {
+                if ( chLast == _T('\r') ) {
                     // Mac line termination
                     result += eol;
-                    chLast = ch;
-                }
-                else {
-                    // add to the current line
-                    result += ch;
                 }
+
+                // add to the current line
+                result += ch;
         }
     }
 
+    if ( chLast ) {
+        // trailing '\r'
+        result += eol;
+    }
+
     return result;
 }
 
@@ -145,6 +150,11 @@ wxTextFile::~wxTextFile()
 // file operations
 // ----------------------------------------------------------------------------
 
+bool wxTextFile::Exists() const
+{
+    return wxFile::Exists(m_strFile);
+}
+
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
@@ -264,7 +274,7 @@ bool wxTextFile::Read()
         case '\r':
           if ( chLast == '\r' ) {
             // Mac empty line
-            m_aLines.Add("");
+            m_aLines.Add(wxEmptyString);
             m_aTypes.Add(wxTextFileType_Mac);
           }
           else