We use native paths now in wxWindows. On the Mac, too.

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index c4863f5bc368721b5f42f22bf81e86c963da5e82..ff284db4840046463b5cfaf028200f25a0f04d25 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -189,14 +189,14 @@ bool wxTextFile::Create()
   }
 }
 
-bool wxTextFile::Open(const wxString& strFile)
+bool wxTextFile::Open(const wxString& strFile, wxMBConv& conv)
 {
   m_strFile = strFile;
 
-  return Open();
+  return Open(conv);
 }
 
-bool wxTextFile::Open()
+bool wxTextFile::Open(wxMBConv& conv)
 {
   // file name must be either given in ctor or in Open(const wxString&)
   wxASSERT( !m_strFile.IsEmpty() );
@@ -206,7 +206,7 @@ bool wxTextFile::Open()
     return FALSE;
 
   // read file into memory
-  m_isOpened = Read();
+  m_isOpened = Read(conv);
 
   m_file.Close();
 
@@ -217,13 +217,12 @@ bool wxTextFile::Open()
 // if it fails, it assumes the native type for our platform.
 wxTextFileType wxTextFile::GuessType() const
 {
-  // file should be opened and we must be in it's beginning
-  wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
+  wxASSERT( IsOpened() );
 
   // scan the file lines
   size_t nUnix = 0,     // number of '\n's alone
-       nDos  = 0,     // number of '\r\n'
-       nMac  = 0;     // number of '\r's
+         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)
@@ -249,7 +248,7 @@ wxTextFileType wxTextFile::GuessType() const
   #undef   AnalyseLine
 
   // interpret the results (FIXME far from being even 50% fool proof)
-  if ( nDos + nUnix + nMac == 0 ) {
+  if ( nScan > 0 && nDos + nUnix + nMac == 0 ) {
     // no newlines at all
     wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
   }
@@ -277,11 +276,19 @@ wxTextFileType wxTextFile::GuessType() const
   return typeDefault;
 }
 
-bool wxTextFile::Read()
+bool wxTextFile::Read(wxMBConv& conv)
 {
   // 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];
@@ -321,11 +328,23 @@ bool wxTextFile::Read()
             m_aLines.Add(str);
             m_aTypes.Add(wxTextFileType_Mac);
             chLast = ch;
+#if wxUSE_UNICODE
+            if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1)
+                conv_wcBuf[0] = ch;
+            str = conv_wcBuf[0];
+#else
             str = ch;
+#endif
           }
           else {
             // add to the current line
+#if wxUSE_UNICODE
+            if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1)
+                conv_wcBuf[0] = ch;
+            str += conv_wcBuf[0];
+#else
             str += ch;
+#endif
           }
       }
     }
@@ -350,7 +369,7 @@ bool wxTextFile::Close()
     return TRUE;
 }
 
-bool wxTextFile::Write(wxTextFileType typeNew)
+bool wxTextFile::Write(wxTextFileType typeNew, wxMBConv& conv)
 {
   wxTempFile fileTmp(m_strFile);
 
@@ -363,7 +382,7 @@ bool wxTextFile::Write(wxTextFileType typeNew)
   for ( size_t n = 0; n < nCount; n++ ) {
     fileTmp.Write(m_aLines[n] +
                   GetEOL(typeNew == wxTextFileType_None ? m_aTypes[n]
-                                                        : typeNew));
+                                                        : typeNew), conv);
   }
 
   // replace the old file with this one