wxBase compilation fixes

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index d45a4cc49897bae4866e763740e780f788d124a8..3ab5dc94c307d37db837bfae00addc62a9780488 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -14,33 +14,35 @@
 // ============================================================================
 
 #ifdef __GNUG__
 // ============================================================================
 
 #ifdef __GNUG__

-#pragma implementation "textfile.h"
+    #pragma implementation "textfile.h"

 #endif
 
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #endif
 
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #endif  //__BORLANDC__
 

+#if !wxUSE_FILE
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/file.h"
+    #include  "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_TEXTFILE && wxUSE_FILE
-
-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
+#include  "wx/textfile.h"

 
 // ============================================================================
 // wxTextFile class implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 // wxTextFile class implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// static variables
+// static methods (always compiled in)

 // ----------------------------------------------------------------------------
 
 // default type is the native one
 // ----------------------------------------------------------------------------
 
 // default type is the native one


@@ -51,11 +53,83 @@ 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."
 #endif
 
 #else
   wxTextFileType_None;
   #error  "wxTextFile: unsupported platform."
 #endif
 

+const wxChar *wxTextFile::GetEOL(wxTextFileType type)
+{
+    switch ( type ) {
+      default:
+        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"));
+    }
+}
+
+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 eol = GetEOL(type), result;
+
+    // optimization: we know that the length of the new string will be about
+    // the same as the length of the old one, so prealloc memory to aviod
+    // unnecessary relocations
+    result.Alloc(text.Len());
+
+    wxChar chLast = 0;
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+    {
+        wxChar ch = *pc;
+        switch ( ch ) {
+            case _T('\n'):
+                // Dos/Unix line termination
+                result += eol;
+                chLast = 0;
+                break;
+
+            case _T('\r'):
+                if ( chLast == _T('\r') ) {
+                    // Mac empty line
+                    result += eol;
+                }
+                else {
+                    // just remember it: we don't know whether it is just "\r"
+                    // or "\r\n" yet
+                    chLast = _T('\r');
+                }
+                break;
+
+            default:
+                if ( chLast == _T('\r') ) {
+                    // Mac line termination
+                    result += eol;
+                }
+
+                // add to the current line
+                result += ch;
+        }
+    }
+
+    if ( chLast ) {
+        // trailing '\r'
+        result += eol;
+    }
+
+    return result;
+}
+
+#if wxUSE_TEXTFILE

 
 // ----------------------------------------------------------------------------
 // ctors & dtor
 
 // ----------------------------------------------------------------------------
 // ctors & dtor


@@ -63,6 +137,8 @@ const wxTextFileType wxTextFile::typeDefault =
 
 wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile)
 {
 
 wxTextFile::wxTextFile(const wxString& strFile) : m_strFile(strFile)
 {

+  m_nCurLine = 0;
+  m_isOpened = FALSE;

 }
 
 wxTextFile::~wxTextFile()
 }
 
 wxTextFile::~wxTextFile()


@@ -74,6 +150,11 @@ wxTextFile::~wxTextFile()
 // file operations
 // ----------------------------------------------------------------------------
 
 // file operations
 // ----------------------------------------------------------------------------
 

+bool wxTextFile::Exists() const
+{
+    return wxFile::Exists(m_strFile);
+}
+

 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;


@@ -91,11 +172,11 @@ bool wxTextFile::Open()
     return FALSE;
 
   // read file into memory
     return FALSE;
 
   // read file into memory

-  bool bRet = Read();
+  m_isOpened = Read();

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

-  return bRet;
+  return m_isOpened;

 }
 
 // analyse some lines of the file trying to guess it's type.
 }
 
 // analyse some lines of the file trying to guess it's type.


@@ -133,7 +214,7 @@ wxTextFileType wxTextFile::GuessType() const
 
   #undef   AnalyseLine
 
 
   #undef   AnalyseLine
 

-  // interpret the results (@@ far from being even 50% fool proof)
+  // interpret the results (FIXME far from being even 50% fool proof)

   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all
     wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all
     wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());


@@ -175,7 +256,6 @@ bool wxTextFile::Read()
     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)

-      m_file.Close();

       return FALSE;
     }
 
       return FALSE;
     }
 


@@ -194,7 +274,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


@@ -231,6 +311,7 @@ bool wxTextFile::Close()
     m_aTypes.Clear();
     m_aLines.Clear();
     m_nCurLine = 0;
     m_aTypes.Clear();
     m_aLines.Clear();
     m_nCurLine = 0;

+    m_isOpened = FALSE;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -255,18 +336,5 @@ bool wxTextFile::Write(wxTextFileType typeNew)
   return fileTmp.Commit();
 }
 
   return fileTmp.Commit();
 }
 

-const wxChar *wxTextFile::GetEOL(wxTextFileType type)
-{
-    switch ( type ) {
-      case wxTextFileType_None: return _T("");
-      case wxTextFileType_Unix: return _T("\n");
-      case wxTextFileType_Dos:  return _T("\r\n");
-      case wxTextFileType_Mac:  return _T("\r");
-
-      default:
-        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
-        return (const wxChar *) NULL;
-    }
-}
+#endif // wxUSE_TEXTFILE

 
 

-#endif