Fixed the drawing of the HRules so they don't try to iterate over all

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 9b35dfd8deadd655cfef999f3d2b35a61f0696eb..ff284db4840046463b5cfaf028200f25a0f04d25 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -74,13 +74,16 @@ const wxChar *wxTextFile::GetEOL(wxTextFileType type)
     }
 }
 
     }
 }
 

-

 wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
 {
     // don't do anything if there is nothing to do
     if ( type == wxTextFileType_None )
         return text;
 
 wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
 {
     // don't do anything if there is nothing to do
     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
     wxString eol = GetEOL(type), result;
 
     // optimization: we know that the length of the new string will be about


@@ -93,34 +96,44 @@ wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
     {
         wxChar ch = *pc;
         switch ( ch ) {
     {
         wxChar ch = *pc;
         switch ( ch ) {

-            case '\n':
+            case _T('\n'):

                 // Dos/Unix line termination
                 result += eol;
                 // Dos/Unix line termination
                 result += eol;

-                chLast = '\n';
+                chLast = 0;

                 break;
 
                 break;
 

-            case '\r':
-                if ( chLast == '\r' ) {
+            case _T('\r'):
+                if ( chLast == _T('\r') ) {

                     // Mac empty line
                     result += eol;
                 }
                     // Mac empty line
                     result += eol;
                 }

-                else
-                    chLast = '\r';
+                else {
+                    // just remember it: we don't know whether it is just "\r"
+                    // or "\r\n" yet
+                    chLast = _T('\r');
+                }

                 break;
 
             default:
                 break;
 
             default:

-                if ( chLast == '\r' ) {
+                if ( chLast == _T('\r') ) {

                     // Mac line termination
                     result += eol;
                     // Mac line termination
                     result += eol;

-                    chLast = ch;
-                }
-                else {
-                    // add to the current line
-                    result += ch;
+
+                    // reset chLast to avoid inserting another eol before the
+                    // next character
+                    chLast = 0;

                 }
                 }

+
+                // add to the current line
+                result += ch;

         }
     }
 
         }
     }
 

+    if ( chLast ) {
+        // trailing '\r'
+        result += eol;
+    }
+

     return result;
 }
 
     return result;
 }
 


@@ -145,14 +158,45 @@ wxTextFile::~wxTextFile()
 // file operations
 // ----------------------------------------------------------------------------
 
 // file operations
 // ----------------------------------------------------------------------------
 

-bool wxTextFile::Open(const wxString& strFile)
+bool wxTextFile::Exists() const
+{
+    return wxFile::Exists(m_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;
 
 {
   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() );
 {
   // file name must be either given in ctor or in Open(const wxString&)
   wxASSERT( !m_strFile.IsEmpty() );


@@ -162,7 +206,7 @@ bool wxTextFile::Open()
     return FALSE;
 
   // read file into memory
     return FALSE;
 
   // read file into memory

-  m_isOpened = Read();
+  m_isOpened = Read(conv);

 
   m_file.Close();
 
 
   m_file.Close();
 


@@ -173,13 +217,12 @@ bool wxTextFile::Open()
 // if it fails, it assumes the native type for our platform.
 wxTextFileType wxTextFile::GuessType() const
 {
 // 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
 
   // 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)
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)


@@ -205,7 +248,7 @@ wxTextFileType wxTextFile::GuessType() const
   #undef   AnalyseLine
 
   // interpret the results (FIXME far from being even 50% fool proof)
   #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());
   }
     // no newlines at all
     wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
   }


@@ -233,16 +276,24 @@ wxTextFileType wxTextFile::GuessType() const
   return typeDefault;
 }
 
   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 );
 
 {
   // 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)


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

-            m_aLines.Add("");
+            m_aLines.Add(wxEmptyString);

             m_aTypes.Add(wxTextFileType_Mac);
           }
           else
             m_aTypes.Add(wxTextFileType_Mac);
           }
           else


@@ -277,15 +328,27 @@ bool wxTextFile::Read()
             m_aLines.Add(str);
             m_aTypes.Add(wxTextFileType_Mac);
             chLast = ch;
             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;
             str = ch;

+#endif

           }
           else {
             // add to the current line
           }
           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;
             str += ch;

+#endif

           }
       }
     }
           }
       }
     }

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

 
   // anything in the last line?
   if ( !str.IsEmpty() ) {
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {


@@ -306,7 +369,7 @@ bool wxTextFile::Close()
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
   wxTempFile fileTmp(m_strFile);
 
 {
   wxTempFile fileTmp(m_strFile);
 


@@ -319,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]
   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
   }
 
   // replace the old file with this one