Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index da1e7c2d8792af3089b5f72c1b23e5958c978fff..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();
 
@@ -53,7 +55,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream
@@ -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();
 
@@ -83,7 +87,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream
@@ -108,7 +112,7 @@ protected:
 private:
     wxTempFile *m_file;
 
-    DECLARE_NO_COPY_CLASS(wxTempFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
@@ -118,8 +122,33 @@ public:
     wxFileStream(const wxString& fileName);
     virtual bool IsOk() const;
 
+    // override (some) virtual functions inherited from both classes to resolve
+    // ambiguities (this wouldn't be necessary if wxStreamBase were a virtual
+    // base class but it isn't)
+
+    virtual bool IsSeekable() const
+    {
+        return wxFileInputStream::IsSeekable();
+    }
+
+    virtual wxFileOffset GetLength() const
+    {
+        return wxFileInputStream::GetLength();
+    }
+
+protected:
+    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+    {
+        return wxFileInputStream::OnSysSeek(pos, mode);
+    }
+
+    virtual wxFileOffset OnSysTell() const
+    {
+        return wxFileInputStream::OnSysTell();
+    }
+
 private:
-    DECLARE_NO_COPY_CLASS(wxFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileStream);
 };
 
 #endif //wxUSE_FILE
@@ -144,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();
 
@@ -155,7 +186,7 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
@@ -174,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();
 
@@ -185,7 +218,7 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
@@ -193,10 +226,35 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
 {
 public:
     wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
+
+    // override some virtual functions to resolve ambiguities, just as in
+    // wxFileStream
+
     virtual bool IsOk() const;
 
+    virtual bool IsSeekable() const
+    {
+        return wxFFileInputStream::IsSeekable();
+    }
+
+    virtual wxFileOffset GetLength() const
+    {
+        return wxFFileInputStream::GetLength();
+    }
+
+protected:
+    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+    {
+        return wxFFileInputStream::OnSysSeek(pos, mode);
+    }
+
+    virtual wxFileOffset OnSysTell() const
+    {
+        return wxFFileInputStream::OnSysTell();
+    }
+
 private:
-    DECLARE_NO_COPY_CLASS(wxFFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileStream);
 };
 
 #endif //wxUSE_FFILE