X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7749df1f415574250a8828abd99a6868eb3071dd..3e418ffc1002c514f0e3e876809c33ae9ad8695b:/src/common/textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 711b8de6ef..2e6ad8bdd9 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -38,15 +38,15 @@
 // ----------------------------------------------------------------------------
 
 // default type is the native one
-const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
+const wxTextFileType wxTextFile::typeDefault =
 #if   defined(__WINDOWS__)
-  Type_Dos;
+  wxTextFileType_Dos;
 #elif defined(__UNIX__)
-  Type_Unix;
+  wxTextFileType_Unix;
 #elif defined(__WXMAC__)
-  Type_Mac;
+  wxTextFileType_Mac;
 #else
-  Type_None;
+  wxTextFileType_None;
   #error  "wxTextFile: unsupported platform."
 #endif
 
@@ -93,7 +93,7 @@ bool wxTextFile::Open()
 
 // analyse some lines of the file trying to guess it's type.
 // if it fails, it assumes the native type for our platform.
-wxTextFile::Type wxTextFile::GuessType() const
+wxTextFileType wxTextFile::GuessType() const
 {
   // file should be opened and we must be in it's beginning
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
@@ -110,9 +110,9 @@ wxTextFile::Type wxTextFile::GuessType() const
 
   #define   AnalyseLine(n)              \
     switch ( m_aTypes[n] ) {            \
-      case Type_Unix: nUnix++; break;   \
-      case Type_Dos:  nDos++;  break;   \
-      case Type_Mac:  nMac++;  break;   \
+      case wxTextFileType_Unix: nUnix++; break;   \
+      case wxTextFileType_Dos:  nDos++;  break;   \
+      case wxTextFileType_Mac:  nMac++;  break;   \
       default: wxFAIL_MSG(_("unknown line terminator")); \
     }
 
@@ -133,17 +133,23 @@ wxTextFile::Type wxTextFile::GuessType() const
   }
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
-                                                : n##t1 > n##t2 ? Type_##t1 \
-                                                                : Type_##t2
+                                                : n##t1 > n##t2             \
+                                                    ? wxTextFileType_##t1     \
+                                                    : wxTextFileType_##t2
 
+// Watcom C++ doesn't seem to be able to handle the macro
+#if defined(__WATCOMC__)
+    return typeDefault;
+#else
     if ( nDos > nUnix )
       return GREATER_OF(Dos, Mac);
     else if ( nDos < nUnix )
       return GREATER_OF(Unix, Mac);
     else {
       // nDos == nUnix
-      return nMac > nDos ? Type_Mac : typeDefault;
+      return nMac > nDos ? wxTextFileType_Mac : typeDefault;
     }
+#endif
 
     #undef    GREATER_OF
   }
@@ -174,7 +180,8 @@ bool wxTextFile::Read()
         case '\n':
           // Dos/Unix line termination
           m_aLines.Add(str);
-          m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix);
+          m_aTypes.Add(chLast == '\r' ? wxTextFileType_Dos
+                                      : wxTextFileType_Unix);
           str.Empty();
           chLast = '\n';
           break;
@@ -183,7 +190,7 @@ bool wxTextFile::Read()
           if ( chLast == '\r' ) {
             // Mac empty line
             m_aLines.Add("");
-            m_aTypes.Add(Type_Mac);
+            m_aTypes.Add(wxTextFileType_Mac);
           }
           else
             chLast = '\r';
@@ -193,7 +200,7 @@ bool wxTextFile::Read()
           if ( chLast == '\r' ) {
             // Mac line termination
             m_aLines.Add(str);
-            m_aTypes.Add(Type_Mac);
+            m_aTypes.Add(wxTextFileType_Mac);
             chLast = ch;
             str = ch;
           }
@@ -207,14 +214,14 @@ bool wxTextFile::Read()
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {
-    m_aTypes.Add(Type_None);  // no line terminator
+    m_aTypes.Add(wxTextFileType_None);  // no line terminator
     m_aLines.Add(str);
   }
 
   return TRUE;
 }
 
-bool wxTextFile::Write(Type typeNew)
+bool wxTextFile::Write(wxTextFileType typeNew)
 {
   wxTempFile fileTmp(m_strFile);
 
@@ -226,9 +233,25 @@ bool wxTextFile::Write(Type typeNew)
   size_t nCount = m_aLines.Count();
   for ( size_t n = 0; n < nCount; n++ ) {
     fileTmp.Write(m_aLines[n] +
-                  GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
+                  GetEOL(typeNew == wxTextFileType_None ? m_aTypes[n]
+                                                        : typeNew));
   }
 
   // replace the old file with this one
   return fileTmp.Commit();
 }
+
+const char *wxTextFile::GetEOL(wxTextFileType type)
+  {
+    switch ( type ) {
+      case wxTextFileType_None: return "";
+      case wxTextFileType_Unix: return "\n";
+      case wxTextFileType_Dos:  return "\r\n";
+      case wxTextFileType_Mac:  return "\r";
+
+      default:
+        wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
+        return (const char *) NULL;
+    }
+  }
+