Merge in from trunk r64802 - r68625

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

diff --git a/interface/wx/ffile.h b/interface/wx/ffile.h
index f5d1f37871419bfece76f74bec18681933e9da33..097bf94e3a293c6fad8f955e45a439bc9e3f56ea 100644 (file)
--- a/interface/wx/ffile.h
+++ b/interface/wx/ffile.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFFile
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -90,7 +90,7 @@ public:
 
         The descriptor should be already opened and it will be closed by wxFFile object.
     */
-    void Attach(FILE* fp);
+    void Attach(FILE* fp, const wxString& name = wxEmptyString);
 
     /**
         Closes the file and returns @true on success.
@@ -106,7 +106,7 @@ public:
     void Detach();
 
     /**
-        Returns @true if the an attempt has been made to read @e past
+        Returns @true if an attempt has been made to read @e past
         the end of the file.
 
         Note that the behaviour of the file descriptor based class  wxFile is different as