Trying to hide evidence of my negative programming skills...

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index c6e33dcca36d8019f0644b0591d9ddf5e0b66735..ec93546696cc1a0b877c18839a8343b39763a9b5 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -20,11 +20,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

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

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -136,7 +131,7 @@ public:
                   wxTextFileType type = typeDefault)
     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line
                   wxTextFileType type = typeDefault)
     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line

-  void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
+  void RemoveLine(size_t n) { m_aLines.RemoveAt(n); m_aTypes.RemoveAt(n); }

 
   // change the file on disk (default argument means "don't change type")
   // possibly in another format
 
   // change the file on disk (default argument means "don't change type")
   // possibly in another format


@@ -190,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