applied a patch to ignore the modifiers (things like @euro) in LC_XXX vars

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 3ab5dc94c307d37db837bfae00addc62a9780488..e303e47d2c31c92ab4f861ff1c1065c2505ceb6c 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -46,6 +46,10 @@
 // ----------------------------------------------------------------------------
 
 // default type is the native one
+// the native type under Mac OS X is:
+//   - Unix when compiling with the Apple Developer Tools (__UNIX__)
+//   - Mac when compiling with CodeWarrior (__WXMAC__)
+
 const wxTextFileType wxTextFile::typeDefault =
 #if   defined(__WINDOWS__)
   wxTextFileType_Dos;
@@ -67,10 +71,10 @@ const wxChar *wxTextFile::GetEOL(wxTextFileType type)
         wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL."));
         // fall through nevertheless - we must return something...
 
-      case wxTextFileType_None: return wxT(_T(""));
-      case wxTextFileType_Unix: return wxT(_T("\n"));
-      case wxTextFileType_Dos:  return wxT(_T("\r\n"));
-      case wxTextFileType_Mac:  return wxT(_T("\r"));
+      case wxTextFileType_None: return wxT("");
+      case wxTextFileType_Unix: return wxT("\n");
+      case wxTextFileType_Dos:  return wxT("\r\n");
+      case wxTextFileType_Mac:  return wxT("\r");
     }
 }
 
@@ -80,6 +84,10 @@ wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
     if ( type == wxTextFileType_None )
         return text;
 
+    // GRG: don't do anything either if it is empty
+    if ( text.IsEmpty() )
+        return text;
+
     wxString eol = GetEOL(type), result;
 
     // optimization: we know that the length of the new string will be about
@@ -114,6 +122,10 @@ wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
                 if ( chLast == _T('\r') ) {
                     // Mac line termination
                     result += eol;
+
+                    // reset chLast to avoid inserting another eol before the
+                    // next character
+                    chLast = 0;
                 }
 
                 // add to the current line
@@ -155,14 +167,40 @@ bool wxTextFile::Exists() const
     return wxFile::Exists(m_strFile);
 }
 
-bool wxTextFile::Open(const wxString& strFile)
+bool wxTextFile::Create(const wxString& strFile)
+{
+  m_strFile = strFile;
+
+  return Create();
+}
+
+bool wxTextFile::Create()
+{
+  // file name must be either given in ctor or in Create(const wxString&)
+  wxASSERT( !m_strFile.IsEmpty() );
+
+  // if the file already exists do nothing
+  if ( Exists() ) return FALSE;
+  
+  if ( m_file.Open(m_strFile, wxFile::write) )
+  {
+    m_file.Close();
+    return TRUE;
+  }
+  else
+  {
+    return FALSE;
+  }
+}
+
+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() );
@@ -172,7 +210,7 @@ bool wxTextFile::Open()
     return FALSE;
 
   // read file into memory
-  m_isOpened = Read();
+  m_isOpened = Read(conv);
 
   m_file.Close();
 
@@ -183,13 +221,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)
@@ -215,7 +252,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());
   }
@@ -243,16 +280,24 @@ 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];
   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)
@@ -287,15 +332,27 @@ 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
           }
       }
     }
-  }
+  } while ( nRead == WXSIZEOF(buf) );
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {
@@ -316,7 +373,7 @@ bool wxTextFile::Close()
     return TRUE;
 }
 
-bool wxTextFile::Write(wxTextFileType typeNew)
+bool wxTextFile::Write(wxTextFileType typeNew, wxMBConv& conv)
 {
   wxTempFile fileTmp(m_strFile);
 
@@ -329,7 +386,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