OSX adaptions

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 79cdb866cf04a391a24b824d61501daefb6bfc39..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
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +11,6 @@
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 
 #ifndef _WX_WXFSTREAM_H__
 #define _WX_WXFSTREAM_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "wfstream.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_STREAMS
 #include "wx/defs.h"
 
 #if wxUSE_STREAMS


@@ -38,13 +33,16 @@ 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;

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

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

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


@@ -56,7 +54,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
     wxFile *m_file;
     bool m_file_destroy;
 

-    DECLARE_NO_COPY_CLASS(wxFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream


@@ -71,9 +69,12 @@ 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;

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

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

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


@@ -85,7 +86,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
     wxFile *m_file;
     bool m_file_destroy;
 

-    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileOutputStream);

 };
 
 class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream


@@ -95,8 +96,8 @@ public:
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }

-    virtual bool Commit() { return m_file->Commit(); }
-    virtual void Discard() { m_file->Discard(); }
+    WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
+    WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }

 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }
 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }


@@ -110,7 +111,7 @@ protected:
 private:
     wxTempFile *m_file;
 
 private:
     wxTempFile *m_file;
 

-    DECLARE_NO_COPY_CLASS(wxTempFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 };
 
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,


@@ -118,9 +119,35 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 {
 public:
     wxFileStream(const wxString& fileName);
 {
 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:
 
 private:

-    DECLARE_NO_COPY_CLASS(wxFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileStream);

 };
 
 #endif //wxUSE_FILE
 };
 
 #endif //wxUSE_FILE


@@ -134,16 +161,19 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:

-    wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
+    wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");

     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     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;

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

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

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


@@ -155,13 +185,13 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
     wxFFile *m_file;
     bool m_file_destroy;
 

-    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:

-    wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b"));
+    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb");

     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();


@@ -170,9 +200,12 @@ 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;

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

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

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


@@ -184,17 +217,43 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
     wxFFile *m_file;
     bool m_file_destroy;
 

-    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
                                        public wxFFileOutputStream
 {
 public:
 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
                                        public wxFFileOutputStream
 {
 public:

-    wxFFileStream(const wxString& fileName);
+    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:
 
 private:

-    DECLARE_NO_COPY_CLASS(wxFFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileStream);

 };
 
 #endif //wxUSE_FFILE
 };
 
 #endif //wxUSE_FFILE