Add wxHtmlTag::GetParamAsString() convenience method.

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 15984f7b1108bff36787bacd0ff619cf1d14effa..91a7c28ed4f65ba45c4a6f87b5ee375675bd1931 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -37,20 +36,20 @@ public:
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())

-  wxFFile(const wxChar *filename, const wxChar *mode = _T("r"));
+  wxFFile(const wxString& filename, const wxString& mode = wxT("r"));

     // attach to (already opened) file
   wxFFile(FILE *lfp) { m_fp = lfp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)
     // attach to (already opened) file
   wxFFile(FILE *lfp) { m_fp = lfp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)

-  bool Open(const wxChar *filename, const wxChar *mode = _T("r"));
+  bool Open(const wxString& filename, const wxString& mode = wxT("r"));

     // closes the opened file (this is a NOP if not opened)
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object
   void Attach(FILE *lfp, const wxString& name = wxEmptyString)
     { Close(); m_fp = lfp; m_name = name; }
     // closes the opened file (this is a NOP if not opened)
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object
   void Attach(FILE *lfp, const wxString& name = wxEmptyString)
     { Close(); m_fp = lfp; m_name = name; }

-  void Detach() { m_fp = NULL; }
+  FILE* Detach() { FILE* fpOld = m_fp; m_fp = NULL; return fpOld; }

   FILE *fp() const { return m_fp; }
 
   // read/write (unbuffered)
   FILE *fp() const { return m_fp; }
 
   // read/write (unbuffered)