X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c23894955325535bf603be74a3c0dc8d3fce65ab..76784eecd960198bc54429a6e16d5bd7af458fce:/src/common/textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 2e6ad8bdd9..d45a4cc498 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -23,6 +23,12 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#endif
+
+#if wxUSE_TEXTFILE && wxUSE_FILE
+
 #include  <wx/string.h>
 #include  <wx/intl.h>
 #include  <wx/file.h>
@@ -71,6 +77,7 @@ wxTextFile::~wxTextFile()
 bool wxTextFile::Open(const wxString& strFile)
 {
   m_strFile = strFile;
+
   return Open();
 }
 
@@ -134,13 +141,11 @@ wxTextFileType wxTextFile::GuessType() const
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
                                                 : n##t1 > n##t2             \
-                                                    ? wxTextFileType_##t1     \
+                                                    ? wxTextFileType_##t1   \
                                                     : wxTextFileType_##t2
 
-// Watcom C++ doesn't seem to be able to handle the macro
-#if defined(__WATCOMC__)
-    return typeDefault;
-#else
+    // Watcom C++ doesn't seem to be able to handle the macro
+#if !defined(__WATCOMC__)
     if ( nDos > nUnix )
       return GREATER_OF(Dos, Mac);
     else if ( nDos < nUnix )
@@ -149,7 +154,7 @@ wxTextFileType wxTextFile::GuessType() const
       // nDos == nUnix
       return nMac > nDos ? wxTextFileType_Mac : typeDefault;
     }
-#endif
+#endif // __WATCOMC__
 
     #undef    GREATER_OF
   }
@@ -221,6 +226,15 @@ bool wxTextFile::Read()
   return TRUE;
 }
 
+bool wxTextFile::Close()
+{
+    m_aTypes.Clear();
+    m_aLines.Clear();
+    m_nCurLine = 0;
+
+    return TRUE;
+}
+
 bool wxTextFile::Write(wxTextFileType typeNew)
 {
   wxTempFile fileTmp(m_strFile);
@@ -241,17 +255,18 @@ bool wxTextFile::Write(wxTextFileType typeNew)
   return fileTmp.Commit();
 }
 
-const char *wxTextFile::GetEOL(wxTextFileType type)
-  {
+const wxChar *wxTextFile::GetEOL(wxTextFileType type)
+{
     switch ( type ) {
-      case wxTextFileType_None: return "";
-      case wxTextFileType_Unix: return "\n";
-      case wxTextFileType_Dos:  return "\r\n";
-      case wxTextFileType_Mac:  return "\r";
+      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("bad file type in wxTextFile::GetEOL.");
-        return (const char *) NULL;
+        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
+        return (const wxChar *) NULL;
     }
-  }
+}
 
+#endif