Unicode compilation fixes

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index f52f9480a57f034b9b17a50f873b7b8a8339f874..adf3aa659be0f1a7834a94e23694720296c1c088 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        textfile.cpp
+// Name:        src/common/textfile.cpp

 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxTextFile class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -14,173 +14,109 @@
 // ============================================================================
 
 #ifdef __GNUG__
 // ============================================================================
 
 #ifdef __GNUG__

-#pragma implementation "textfile.h"
+    #pragma implementation "textfile.h"

 #endif
 
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #endif
 
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #endif  //__BORLANDC__
 

-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
+#if !wxUSE_FILE || !wxUSE_TEXTBUFFER
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE

 
 

-// ============================================================================
-// wxTextFile class implementation
-// ============================================================================
+#if wxUSE_TEXTFILE

 
 

-// ----------------------------------------------------------------------------
-// static variables
-// ----------------------------------------------------------------------------
-
-// default type is the native one
-const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if   defined(__WXMSW__)
-  Type_Dos;
-#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."
-#else
-  Type_None;
-  #error  "wxTextFile: unsupported platform."
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/file.h"
+    #include  "wx/log.h"

 #endif
 
 #endif
 

+#include "wx/textfile.h"

 
 

-// ----------------------------------------------------------------------------
-// ctors & dtor
-// ----------------------------------------------------------------------------
+// ============================================================================
+// wxTextFile class implementation
+// ============================================================================

 
 

-wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile)
+wxTextFile::wxTextFile(const wxString& strFileName)
+          : wxTextBuffer(strFileName)

 {
 }
 
 {
 }
 

-wxTextFile::~wxTextFile()
-{
-  // m_file dtor called automatically
-}

 
 // ----------------------------------------------------------------------------
 // file operations
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // file operations
 // ----------------------------------------------------------------------------
 

-bool wxTextFile::Open(const wxString& strFile)
+bool wxTextFile::OnExists() const

 {
 {

-  m_strFile = strFile;
-  return Open();
+    return wxFile::Exists(m_strBufferName);

 }
 
 }
 

-bool wxTextFile::Open()
-{
-  // file name must be either given in ctor or in Open(const wxString&)
-  wxASSERT( !m_strFile.IsEmpty() );
-
-  // open file in read-only mode
-  if ( !m_file.Open(m_strFile) )
-    return FALSE;
-
-  // read file into memory
-  bool bRet = Read();
-
-  m_file.Close();
-
-  return bRet;
-}

 
 

-// 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
+bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode)

 {
 {

-  // 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
-       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,
-       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")); \
-    }
-
-  uint n;
-  for ( n = 0; n < nScan; n++ )     // the beginning
-    AnalyseLine(n);
-  for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
-    AnalyseLine(n);
-  for ( n = nCount - nScan; n < nCount; n++ )
-    AnalyseLine(n);
-
-  #undef   AnalyseLine
-
-  // interpret the results (@@ far from being even 50% fool proof)
-  if ( nDos + nUnix + nMac == 0 ) {
-    // no newlines at all
-    wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
+    wxFile::OpenMode FileOpenMode = wxFile::read;
+  
+    switch (OpenMode)
+  {
+        case ReadAccess :
+            FileOpenMode = wxFile::read;
+            break;
+        case WriteAccess :
+            FileOpenMode = wxFile::write;
+            break;
+        default :
+            wxASSERT(0); // Should not happen.
+            break;

   }
   }

-  else {
-    #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
-                                                : n##t1 > n##t2 ? Type_##t1 \
-                                                                : Type_##t2
-
-    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;
-    }

 
 

-    #undef    GREATER_OF
-  }
+    return m_file.Open(strBufferName.c_str(), FileOpenMode);
+}
+

 
 

-  return typeDefault;
+bool wxTextFile::OnClose()
+{
+    return m_file.Close();

 }
 
 }
 

-bool wxTextFile::Read()
+
+bool wxTextFile::OnRead(wxMBConv& conv)

 {
   // file should be opened and we must be in it's beginning
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
 
 {
   // file should be opened and we must be in it's beginning
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
 

+#if wxUSE_UNICODE
+  char conv_mbBuf[2];
+  wchar_t conv_wcBuf[2];
+  conv_mbBuf[1] = 0;
+#else
+  (void)conv;
+#endif
+

   wxString str;
   char ch, chLast = '\0';
   char buf[1024];
   int n, nRead;
   wxString str;
   char ch, chLast = '\0';
   char buf[1024];
   int n, nRead;

-  while ( !m_file.Eof() ) {
+  do {

     nRead = m_file.Read(buf, WXSIZEOF(buf));
     if ( nRead == wxInvalidOffset ) {
       // read error (error message already given in wxFile::Read)
     nRead = m_file.Read(buf, WXSIZEOF(buf));
     if ( nRead == wxInvalidOffset ) {
       // read error (error message already given in wxFile::Read)

-      m_file.Close();

       return FALSE;
     }
 
       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
     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);
+                AddLine(str, chLast == '\r' ? wxTextFileType_Dos
+                                      : wxTextFileType_Unix);

           str.Empty();
           chLast = '\n';
           break;
           str.Empty();
           chLast = '\n';
           break;


@@ -188,8 +124,7 @@ bool wxTextFile::Read()
         case '\r':
           if ( chLast == '\r' ) {
             // Mac empty line
         case '\r':
           if ( chLast == '\r' ) {
             // Mac empty line

-            m_aLines.Add("");
-            m_aTypes.Add(Type_Mac);
+                    AddLine(wxEmptyString, wxTextFileType_Mac);

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


@@ -198,42 +133,61 @@ bool wxTextFile::Read()
         default:
           if ( chLast == '\r' ) {
             // Mac line termination
         default:
           if ( chLast == '\r' ) {
             // Mac line termination

-            m_aLines.Add(str);
-            m_aTypes.Add(Type_Mac);
+                    AddLine(str, wxTextFileType_Mac);
+            chLast = ch;
+#if wxUSE_UNICODE
+            conv_mbBuf[0] = ch;
+            if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1)
+                conv_wcBuf[0] = ch;
+            str = conv_wcBuf[0];
+#else

             str = ch;
             str = ch;

+#endif

           }
           else {
             // add to the current line
           }
           else {
             // add to the current line

+#if wxUSE_UNICODE
+            conv_mbBuf[0] = ch;
+            if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1)
+                conv_wcBuf[0] = ch;
+            str += conv_wcBuf[0];
+#else

             str += ch;
             str += ch;

+#endif

           }
       }
     }
           }
       }
     }

-  }
+  } while ( nRead == WXSIZEOF(buf) );

 
   // 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_aLines.Add(str);
+        AddLine(str, wxTextFileType_None);  // no line terminator

   }
 
   return TRUE;
 }
 
   }
 
   return TRUE;
 }
 

-bool wxTextFile::Write(Type typeNew)
+
+bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)

 {
 {

-  wxTempFile fileTmp(m_strFile);
+    wxTempFile fileTmp(m_strBufferName);

 
 

-  if ( !fileTmp.IsOpened() ) {
-    wxLogError(_("can't write file '%s' to disk."), m_strFile.c_str());
-    return FALSE;
-  }
+    if ( !fileTmp.IsOpened() ) {
+        wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName.c_str());
+        return FALSE;
+    }

 
 

-  uint nCount = m_aLines.Count();
-  for ( uint n = 0; n < nCount; n++ ) {
-    fileTmp.Write(m_aLines[n] +
-                  GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
-  }
+    size_t nCount = GetLineCount();
+    for ( size_t n = 0; n < nCount; n++ ) {
+        fileTmp.Write(GetLine(n) +
+                      GetEOL(typeNew == wxTextFileType_None ? GetLineType(n)
+                                                            : typeNew),
+                      conv);
+    }

 
 

-  // replace the old file with this one
-  return fileTmp.Commit();
+    // replace the old file with this one
+    return fileTmp.Commit();

 }
 }

+
+#endif // wxUSE_TEXTFILE
+