Added project files for wxUniv under MSW

[wxWidgets.git] / include / wx / textfile.h

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 84042ca0196f6f3591b36d626355044830513f9a..b0d4dd9287bdf7e68e62d9b89ada67293e942cee 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -20,21 +20,12 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if !wxUSE_FILE
-    #undef wxUSE_TEXTFILE
-    #define wxUSE_TEXTFILE 0
-#endif // wxUSE_FILE
-
-#if wxUSE_TEXTFILE
-
-#include "wx/string.h"
-#include "wx/file.h"
-#include "wx/dynarray.h"
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxTextFile
+// constants

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+// NB: this is always defined, even if !wxUSE_TEXTFILE
+

 // the line termination type
 enum wxTextFileType
 {
 // the line termination type
 enum wxTextFileType
 {


@@ -45,7 +36,17 @@ enum wxTextFileType
     wxTextFileType_Os2    //                         'CR' 'LF'
 };
 
     wxTextFileType_Os2    //                         'CR' 'LF'
 };
 

-WX_DEFINE_ARRAY(wxTextFileType, ArrayFileType);
+#if wxUSE_TEXTFILE
+
+#include "wx/string.h"
+#include "wx/file.h"
+#include "wx/dynarray.h"
+
+// ----------------------------------------------------------------------------
+// wxTextFile
+// ----------------------------------------------------------------------------
+
+WX_DEFINE_EXPORTED_ARRAY(wxTextFileType, ArrayFileType);

 
 class WXDLLEXPORT wxTextFile
 {
 
 class WXDLLEXPORT wxTextFile
 {


@@ -73,6 +74,10 @@ public:
   // file operations
     // file exists?
   bool Exists() const;
   // file operations
     // file exists?
   bool Exists() const;

+    // create the file if it doesn't already exist
+  bool Create();
+    // same as Create() but with (another) file name
+  bool Create(const wxString& strFile);

     // Open() also loads file in memory on success
   bool Open();
     // same as Open() but with (another) file name
     // Open() also loads file in memory on success
   bool Open();
     // same as Open() but with (another) file name


@@ -94,7 +99,7 @@ public:
     // you're using "direct access" i.e. GetLine()
   size_t GetCurrentLine() const { return m_nCurLine; }
   void GoToLine(size_t n) { m_nCurLine = n; }
     // you're using "direct access" i.e. GetLine()
   size_t GetCurrentLine() const { return m_nCurLine; }
   void GoToLine(size_t n) { m_nCurLine = n; }

-  bool Eof() const { return m_nCurLine == m_aLines.Count() - 1; }
+  bool Eof() const { return (m_aLines.Count() == 0 || m_nCurLine == m_aLines.Count() - 1); }

 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:
 
     // these methods allow more "iterator-like" traversal of the list of
     // lines, i.e. you may write something like:


@@ -180,6 +185,12 @@ private:
     // copy ctor/assignment operator not implemented
     wxTextFile(const wxTextFile&);
     wxTextFile& operator=(const wxTextFile&);
     // copy ctor/assignment operator not implemented
     wxTextFile(const wxTextFile&);
     wxTextFile& operator=(const wxTextFile&);

+
+    // suppress the gcc warning: 'class defines only private constructors and
+    // has no friends'
+#ifdef __GNUG__
+    friend class wxTextFileDummyFriend;
+#endif // gcc

 };
 
 #endif // wxUSE_TEXTFILE
 };
 
 #endif // wxUSE_TEXTFILE