fix aui crash related to SF bug 1531361

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 42b75669cd462e6a76e696cec2afc3cf5a6f8e7a..63c90a0961feb33cd0e1d774bdecd360cf28c817 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -34,11 +34,12 @@ public:
     wxFileInputStream(const wxString& ifileName);
     wxFileInputStream(wxFile& file);
     wxFileInputStream(int fd);
     wxFileInputStream(const wxString& ifileName);
     wxFileInputStream(wxFile& file);
     wxFileInputStream(int fd);

-    ~wxFileInputStream();
+    virtual ~wxFileInputStream();

 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

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

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -67,7 +68,8 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

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

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -133,11 +135,12 @@ public:
     wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);

-    ~wxFFileInputStream();
+    virtual ~wxFFileInputStream();

 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 

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

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:


@@ -166,7 +169,8 @@ public:
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 
     bool Close() { return m_file_destroy ? m_file->Close() : true; }
     wxFileOffset GetLength() const;
 

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

     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected: