moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index b0d4dd9287bdf7e68e62d9b89ada67293e942cee..6d902976d2abe22d5d70ff3f413fa716714659c2 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -79,9 +79,9 @@ public:
     // same as Create() but with (another) file name
   bool Create(const wxString& strFile);
     // Open() also loads file in memory on success
     // same as Create() but with (another) file name
   bool Create(const wxString& strFile);
     // Open() also loads file in memory on success

-  bool Open();
+  bool Open(wxMBConv& conv = wxConvLibc);

     // same as Open() but with (another) file name
     // same as Open() but with (another) file name

-  bool Open(const wxString& strFile);
+  bool Open(const wxString& strFile, wxMBConv& conv = wxConvLibc);

     // closes the file and frees memory, losing all changes
   bool Close();
     // is file currently opened?
     // closes the file and frees memory, losing all changes
   bool Close();
     // is file currently opened?


@@ -131,11 +131,12 @@ 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

-  bool Write(wxTextFileType typeNew = wxTextFileType_None);
+  bool Write(wxTextFileType typeNew = wxTextFileType_None,
+             wxMBConv& conv = wxConvLibc);

 
   // dtor
   ~wxTextFile();
 
   // dtor
   ~wxTextFile();


@@ -146,7 +147,7 @@ private:
   wxTextFile& operator=(const wxTextFile&);
 
   // read the file in memory (m_file is supposed to be just opened)
   wxTextFile& operator=(const wxTextFile&);
 
   // read the file in memory (m_file is supposed to be just opened)

-  bool Read();
+  bool Read(wxMBConv& conv);

 
   wxFile        m_file;     // current file
 
 
   wxFile        m_file;     // current file