OSX adaptions

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 9a2fa60ba7dcd54b328f4400d94087a2bc7769de..613b4c273bd39088d1019aa97d0c80dea68cb943 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -42,6 +41,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 

+    wxFile* GetFile() const { return m_file; }
+

 protected:
     wxFileInputStream();
 
 protected:
     wxFileInputStream();
 


@@ -72,6 +73,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 

+    wxFile* GetFile() const { return m_file; }
+

 protected:
     wxFileOutputStream();
 
 protected:
     wxFileOutputStream();
 


@@ -118,6 +121,31 @@ public:
     wxFileStream(const wxString& fileName);
     virtual bool IsOk() const;
 
     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:
     wxDECLARE_NO_COPY_CLASS(wxFileStream);
 };
 private:
     wxDECLARE_NO_COPY_CLASS(wxFileStream);
 };


@@ -144,6 +172,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 

+    wxFFile* GetFile() const { return m_file; }
+

 protected:
     wxFFileInputStream();
 
 protected:
     wxFFileInputStream();
 


@@ -174,6 +204,8 @@ public:
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
     virtual bool IsOk() const;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 

+    wxFFile* GetFile() const { return m_file; }
+

 protected:
     wxFFileOutputStream();
 
 protected:
     wxFFileOutputStream();
 


@@ -193,8 +225,33 @@ class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
 {
 public:
     wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
 {
 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 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:
     wxDECLARE_NO_COPY_CLASS(wxFFileStream);
 };
 private:
     wxDECLARE_NO_COPY_CLASS(wxFFileStream);
 };