added wxFileStream::IsOk() (patch 1749587)

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index ae62191d393fbe349af47017a6eecd87822b4258..a0061f52ae24dfa07cf5902bef6622a4969c2889 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -116,6 +116,7 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 {
 public:
     wxFileStream(const wxString& fileName);
 {
 public:
     wxFileStream(const wxString& fileName);

+    virtual bool IsOk() const;

 
 private:
     DECLARE_NO_COPY_CLASS(wxFileStream)
 
 private:
     DECLARE_NO_COPY_CLASS(wxFileStream)

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 5bc7cf1ce22eaa01028b53b259b512111fcc8577..1f1600deffd66ba20e270206639ac6f83baedad9 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -107,9 +107,9 @@ wxFileOffset wxFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
     return m_file->Tell();
 }
 

-bool wxFileInputStream::IsOk() const 
-{ 
-    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+bool wxFileInputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -183,9 +183,9 @@ wxFileOffset wxFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
     return m_file->Length();
 }
 

-bool wxFileOutputStream::IsOk() const 
-{ 
-    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+bool wxFileOutputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -225,6 +225,11 @@ wxFileStream::wxFileStream(const wxString& fileName)
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 

+bool wxFileStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && wxFileInputStream::m_file->IsOpened();
+}
+

 #endif //wxUSE_FILE
 
 #if wxUSE_FFILE
 #endif //wxUSE_FILE
 
 #if wxUSE_FFILE


@@ -300,9 +305,9 @@ wxFileOffset wxFFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
     return m_file->Tell();
 }
 

-bool wxFFileInputStream::IsOk() const 
-{ 
-    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+bool wxFFileInputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -386,9 +391,9 @@ wxFileOffset wxFFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
     return m_file->Length();
 }
 

-bool wxFFileOutputStream::IsOk() const 
-{ 
-    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+bool wxFFileOutputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------