applied patch 430452 (mingw32 compilation fixes)

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 0f9ec816a3ef187cb79354c901a6fae221d792fc..c6e33dcca36d8019f0644b0591d9ddf5e0b66735 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -25,16 +25,12 @@
     #define wxUSE_TEXTFILE 0
 #endif // wxUSE_FILE
 
     #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,6 +41,16 @@ enum wxTextFileType
     wxTextFileType_Os2    //                         'CR' 'LF'
 };
 
     wxTextFileType_Os2    //                         'CR' 'LF'
 };
 

+#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
 WX_DEFINE_EXPORTED_ARRAY(wxTextFileType, ArrayFileType);
 
 class WXDLLEXPORT wxTextFile


@@ -98,7 +104,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: