remove ancient defines left over from GTK1

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

diff --git a/interface/wx/wfstream.h b/interface/wx/wfstream.h
index c6e7845d5073b0cdd5f2495950468fee2b46f396..27c1a3f40648d21a9b1208da8927ce99ab195e50 100644 (file)
--- a/interface/wx/wfstream.h
+++ b/interface/wx/wfstream.h
@@ -2,8 +2,7 @@
 // Name:        wfstream.h
 // Purpose:     interface of wxTempFileOutputStream
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -98,6 +97,12 @@ public:
         Returns @true if the stream is initialized and ready.
     */
     bool IsOk() const;
+
+    /**
+        Returns the underlying file object.
+        @since 2.9.5
+    */
+    wxFFile* GetFile() const;
 };
 
 
@@ -122,7 +127,7 @@ class wxFileOutputStream : public wxOutputStream
 public:
     /**
         Creates a new file with @a ofileName name and initializes the stream in write-only mode.
-        
+
         @warning
         You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
     */
@@ -147,6 +152,12 @@ public:
         Returns @true if the stream is initialized and ready.
     */
     bool IsOk() const;
+
+    /**
+        Returns the underlying file object.
+        @since 2.9.5
+    */
+    wxFile* GetFile() const;
 };
 
 
@@ -171,7 +182,7 @@ class wxFileInputStream : public wxInputStream
 public:
     /**
         Opens the specified file using its @a ifileName name in read-only mode.
-        
+
         @warning
         You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
     */
@@ -196,6 +207,12 @@ public:
         Returns @true if the stream is initialized and ready.
     */
     bool IsOk() const;
+
+    /**
+        Returns the underlying file object.
+        @since 2.9.5
+    */
+    wxFile* GetFile() const;
 };
 
 
@@ -246,6 +263,12 @@ public:
         Returns @true if the stream is initialized and ready.
     */
     bool IsOk() const;
+
+    /**
+        Returns the underlying file object.
+        @since 2.9.5
+    */
+    wxFFile* GetFile() const;
 };
 
 
@@ -253,24 +276,34 @@ public:
 /**
     @class wxFFileStream
 
-    @todo describe this class.
+    This stream allows to both read from and write to a file using buffered
+    STDIO functions.
 
     @library{wxbase}
     @category{streams}
 
-    @see wxStreamBuffer
+    @see wxFFileInputStream, wxFFileOutputStream, wxFileStream
 */
-class wxFFileStream : public wxFFileOutputStream
+class wxFFileStream : public wxFFileInputStream,
+                      public wxFFileOutputStream
 {
 public:
     /**
         Initializes a new file stream in the given @a mode using the specified
         @a iofileName name.
-        
+
         @warning
         You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
     */
     wxFFileStream(const wxString& iofileName, const wxString& mode = "w+b");
+
+    /**
+        Returns @true if the stream is initialized and ready.
+
+        This method returns @true if the stream can be both read from and
+        written to.
+    */
+    bool IsOk() const;
 };
 
 
@@ -278,23 +311,34 @@ public:
 /**
     @class wxFileStream
 
-    @todo describe this class.
+    This class represents data that can be both read from and written to a file.
+    There are actually two such groups of classes: this one is based on wxFile
+    whereas wxFFileStream is based in the wxFFile class.
 
     @library{wxbase}
     @category{streams}
 
-    @see wxStreamBuffer
+    @see wxFileInputStream, wxFileOutputStream, wxFFileStream
 */
-class wxFileStream : public wxFileOutputStream
+class wxFileStream : public wxFileOutputStream,
+                     public wxFileInputStream
 {
 public:
     /**
         Initializes a new file stream in read-write mode using the specified
         @a iofileName name.
-        
+
         @warning
-        You should use wxStreamBase::IsOk() to verify if the constructor succeeded.
+        You should use IsOk() to verify if the constructor succeeded.
     */
     wxFileStream(const wxString& iofileName);
+
+    /**
+        Returns @true if the stream is initialized and ready.
+
+        This method returns @true if the stream can be both read from and
+        written to.
+    */
+    bool IsOk() const;
 };