Remaining Makefile.ins,

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 678ddcc688d73c6f228ca33076476947510b0897..d45a4cc49897bae4866e763740e780f788d124a8 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -23,6 +23,12 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
   #pragma hdrstop
 #endif  //__BORLANDC__
 

+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#endif
+
+#if wxUSE_TEXTFILE && wxUSE_FILE
+

 #include  <wx/string.h>
 #include  <wx/intl.h>
 #include  <wx/file.h>
 #include  <wx/string.h>
 #include  <wx/intl.h>
 #include  <wx/file.h>


@@ -38,17 +44,15 @@
 // ----------------------------------------------------------------------------
 
 // default type is the native one
 // ----------------------------------------------------------------------------
 
 // default type is the native one

-const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if   defined(__WXMSW__)
-  Type_Dos;
+const wxTextFileType wxTextFile::typeDefault =
+#if   defined(__WINDOWS__)
+  wxTextFileType_Dos;

 #elif defined(__UNIX__)
 #elif defined(__UNIX__)

-  Type_Unix;
-#elif defined(__MAC__)
-  Type_Mac;
-  // if you feel brave, remove the next line
-  #error  "wxTextFile: code for Mac files is untested."
+  wxTextFileType_Unix;
+#elif defined(__WXMAC__)
+  wxTextFileType_Mac;

 #else
 #else

-  Type_None;
+  wxTextFileType_None;

   #error  "wxTextFile: unsupported platform."
 #endif
 
   #error  "wxTextFile: unsupported platform."
 #endif
 


@@ -73,6 +77,7 @@ wxTextFile::~wxTextFile()
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;

+

   return Open();
 }
 
   return Open();
 }
 


@@ -95,30 +100,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.
 
 // 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
 {
   // 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)
        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] ) {            \
        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;   \
-      default: wxFAIL_MSG("unknown line terminator"); \
+      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++ )
   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )


@@ -135,17 +140,21 @@ wxTextFile::Type wxTextFile::GuessType() const
   }
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
   }
   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
     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
   }
 
     #undef    GREATER_OF
   }


@@ -164,23 +173,20 @@ bool wxTextFile::Read()
   int n, nRead;
   while ( !m_file.Eof() ) {
     nRead = m_file.Read(buf, WXSIZEOF(buf));
   int n, nRead;
   while ( !m_file.Eof() ) {
     nRead = m_file.Read(buf, WXSIZEOF(buf));

-    if ( nRead == ofsInvalid ) {
+    if ( nRead == wxInvalidOffset ) {

       // read error (error message already given in wxFile::Read)
       m_file.Close();
       return FALSE;
     }
 
       // read error (error message already given in wxFile::Read)
       m_file.Close();
       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);
     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;
           str.Empty();
           chLast = '\n';
           break;


@@ -189,7 +195,7 @@ bool wxTextFile::Read()
           if ( chLast == '\r' ) {
             // Mac empty line
             m_aLines.Add("");
           if ( chLast == '\r' ) {
             // Mac empty line
             m_aLines.Add("");

-            m_aTypes.Add(Type_Mac);
+            m_aTypes.Add(wxTextFileType_Mac);

           }
           else
             chLast = '\r';
           }
           else
             chLast = '\r';


@@ -199,7 +205,8 @@ bool wxTextFile::Read()
           if ( chLast == '\r' ) {
             // Mac line termination
             m_aLines.Add(str);
           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 {
             str = ch;
           }
           else {


@@ -212,14 +219,23 @@ bool wxTextFile::Read()
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {
 
   // 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;
 }
 
     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);
 
 {
   wxTempFile fileTmp(m_strFile);
 


@@ -228,12 +244,29 @@ bool wxTextFile::Write(Type typeNew)
     return FALSE;
   }
 
     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] +
     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();
 }
   }
 
   // replace the old file with this one
   return fileTmp.Commit();
 }

+
+const wxChar *wxTextFile::GetEOL(wxTextFileType type)
+{
+    switch ( type ) {
+      case wxTextFileType_None: return _T("");
+      case wxTextFileType_Unix: return _T("\n");
+      case wxTextFileType_Dos:  return _T("\r\n");
+      case wxTextFileType_Mac:  return _T("\r");
+
+      default:
+        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
+        return (const wxChar *) NULL;
+    }
+}
+
+#endif