Add GetFile() accessor to wxFileStream classes.

Allow to retrieve the underlying file used by the stream.

Closes #15093.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 70ec5413a2c228527e97f95d87e90c6aea38c7e3..cf2e34f02a85cf1c485605d83b722b5b6b607111 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -566,6 +566,7 @@ All:
 - Add wxFile::ReadAll() for consistency with wxFFile.
 - Add wxDateTime::DiffAsDateSpan() and wxDateSpan::GetTotalMonths() (jonasr).
 - Add wxVector::assign() (Jonas Rydberg).
+- Add wx[F]File{Input,Output}Stream::GetFile() (troelsk).
 - Added Nepali translation (Him Prasad Gautam).
 
 All (GUI):

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 1c44202177e8a443e793410d249416274a6e1078..226c094132eca71fc6e8df6f53d0b2c2324d298b 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -42,6 +42,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFile* GetFile() const { return m_file; }
+
 protected:
     wxFileInputStream();
 
@@ -72,6 +74,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFile* GetFile() const { return m_file; }
+
 protected:
     wxFileOutputStream();
 
@@ -169,6 +173,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFFile* GetFile() const { return m_file; }
+
 protected:
     wxFFileInputStream();
 
@@ -199,6 +205,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
+    wxFFile* GetFile() const { return m_file; }
+
 protected:
     wxFFileOutputStream();
 

diff --git a/interface/wx/wfstream.h b/interface/wx/wfstream.h
index 2e3049b3ebd9be299d9587fcf1ddd0c7d20c6f3c..67237247ec96020cf92aa4435b4cd6e22c6db661 100644 (file)
--- a/interface/wx/wfstream.h
+++ b/interface/wx/wfstream.h
@@ -98,6 +98,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;
 };
 
 
@@ -147,6 +153,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;
 };
 
 
@@ -196,6 +208,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 +264,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;
 };