some minor tweaks for the VTK demo

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index b2a1c2afa755331738ee4d7f96386056e678929a..8dff698c9bc31a80057057b3f18729756ba50de2 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -53,6 +53,8 @@ const wxTextFileType wxTextFile::typeDefault =
   wxTextFileType_Unix;
 #elif defined(__WXMAC__)
   wxTextFileType_Mac;
   wxTextFileType_Unix;
 #elif defined(__WXMAC__)
   wxTextFileType_Mac;

+#elif defined(__WXPM__)
+  wxTextFileType_Os2;

 #else
   wxTextFileType_None;
   #error  "wxTextFile: unsupported platform."
 #else
   wxTextFileType_None;
   #error  "wxTextFile: unsupported platform."


@@ -62,23 +64,26 @@ const wxChar *wxTextFile::GetEOL(wxTextFileType type)
 {
     switch ( type ) {
       default:
 {
     switch ( type ) {
       default:

-        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
+        wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL."));

         // fall through nevertheless - we must return something...
 
         // fall through nevertheless - we must return something...
 

-      case wxTextFileType_None: return _T("");
-      case wxTextFileType_Unix: return _T("\n");
-      case wxTextFileType_Dos:  return _T("\r\n");
-      case wxTextFileType_Mac:  return _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");

     }
 }
 
     }
 }
 

-

 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


@@ -91,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;
 }
 


@@ -143,6 +158,37 @@ wxTextFile::~wxTextFile()
 // file operations
 // ----------------------------------------------------------------------------
 
 // file operations
 // ----------------------------------------------------------------------------
 

+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;
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;


@@ -171,8 +217,7 @@ 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


@@ -240,7 +285,7 @@ bool wxTextFile::Read()
   char ch, chLast = '\0';
   char buf[1024];
   int n, nRead;
   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)


@@ -262,7 +307,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


@@ -283,7 +328,7 @@ bool wxTextFile::Read()
           }
       }
     }
           }
       }
     }

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

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