X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8edb3856b9a5e076927e43e2ace8d4a560c3ae4..2b96d0fb4be7d684c17987d74f8f92d0cfe345b5:/include/wx/textfile.h

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index c6e33dcca3..ec93546696 100644
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -20,11 +20,6 @@
 
 #include "wx/defs.h"
 
-#if !wxUSE_FILE
-    #undef wxUSE_TEXTFILE
-    #define wxUSE_TEXTFILE 0
-#endif // wxUSE_FILE
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -136,7 +131,7 @@ public:
                   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
@@ -190,6 +185,12 @@ private:
     // 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