Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index cf3095cd5e18b6ad32dfaea71d9f0c401868a9a2..c09b7e86473895d8694f75a2b91647cb6ce41d29 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -45,8 +45,6 @@ const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
   Type_Unix;
 #elif defined(__WXMAC__)
   Type_Mac;
-  // if you feel brave, remove the next line
-  #error  "wxTextFile: code for Mac files is untested."
 #else
   Type_None;
   #error  "wxTextFile: unsupported platform."
@@ -170,10 +168,6 @@ bool wxTextFile::Read()
       return FALSE;
     }
 
-    #ifdef  __MAC__
-      #pragma message("wxTextFile::Read() hasn't been tested with Mac files.")
-    #endif
-
     for ( n = 0; n < nRead; n++ ) {
       ch = buf[n];
       switch ( ch ) {
@@ -200,6 +194,7 @@ bool wxTextFile::Read()
             // Mac line termination
             m_aLines.Add(str);
             m_aTypes.Add(Type_Mac);
+            chLast = ch;
             str = ch;
           }
           else {
@@ -237,3 +232,18 @@ bool wxTextFile::Write(Type typeNew)
   // replace the old file with this one
   return fileTmp.Commit();
 }
+
+const char *wxTextFile::GetEOL(Type type)
+  {
+    switch ( type ) {
+      case Type_None: return "";
+      case Type_Unix: return "\n";
+      case Type_Dos:  return "\r\n";
+      case Type_Mac:  return "\r";
+
+      default:
+        wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
+        return (const char *) NULL;
+    }
+  }
+