X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..b66e7a06b559e868b355b099b53aac52f04b95bb:/src/common/textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index d67663557e..931c5048b6 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -38,17 +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;
-  // if you feel brave, remove the next line
-  #error  "wxTextFile: code for Mac files is untested."
+  wxTextFileType_Mac;
 #else
-  Type_None;
+  wxTextFileType_None;
   #error  "wxTextFile: unsupported platform."
 #endif
 
@@ -73,6 +71,7 @@ wxTextFile::~wxTextFile()
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
+
   return Open();
 }
 
@@ -95,30 +94,30 @@ 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 );
 
   // scan the file lines
-  uint nUnix = 0,     // number of '\n's alone
+  size_t nUnix = 0,     // number of '\n's alone
        nDos  = 0,     // number of '\r\n'
        nMac  = 0;     // number of '\r's
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)
-  uint nCount = m_aLines.Count() / 3,
+  size_t nCount = m_aLines.Count() / 3,
        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
 
   #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")); \
     }
 
-  uint n;
+  size_t n;
   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
@@ -135,17 +134,21 @@ 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__)
     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 // __WATCOMC__
 
     #undef    GREATER_OF
   }
@@ -170,17 +173,14 @@ 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 ) {
         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;
@@ -189,7 +189,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';
@@ -199,7 +199,8 @@ 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;
           }
           else {
@@ -212,14 +213,23 @@ 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::Close()
+{
+    m_aTypes.Clear();
+    m_aLines.Clear();
+    m_nCurLine = 0;
+
+    return TRUE;
+}
+
+bool wxTextFile::Write(wxTextFileType typeNew)
 {
   wxTempFile fileTmp(m_strFile);
 
@@ -228,12 +238,28 @@ bool wxTextFile::Write(Type typeNew)
     return FALSE;
   }
 
-  uint nCount = m_aLines.Count();
-  for ( uint n = 0; n < nCount; n++ ) {
+  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;
+    }
+  }
+