Speed fix for wxGenericDirCtrl, starting to add text input control;

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index f10d5de5761495cc85e42da101ce1897c8d7439d..c4863f5bc368721b5f42f22bf81e86c963da5e82 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -67,10 +67,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");
     }
 }
 
@@ -118,6 +118,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
@@ -159,6 +163,32 @@ 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)
 {
   m_strFile = strFile;
@@ -256,7 +286,7 @@ bool wxTextFile::Read()
   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)
@@ -299,7 +329,7 @@ bool wxTextFile::Read()
           }
       }
     }
-  }
+  } while ( nRead == WXSIZEOF(buf) );
 
   // anything in the last line?
   if ( !str.IsEmpty() ) {