From 7f297193db6a0362906d4e68e0a98199e1b632b0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 9 Mar 2013 15:08:44 +0000 Subject: [PATCH] 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 --- docs/changes.txt | 1 + include/wx/wfstream.h | 8 ++++++++ interface/wx/wfstream.h | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 70ec5413a2..cf2e34f02a 100644 --- 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 1c44202177..226c094132 100644 --- 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 2e3049b3eb..67237247ec 100644 --- 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; }; -- 2.47.2