Have wxUniv wxComboBox inherit from wxItemContainer instead of wxComboBoxBase, since...

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index aea6b17e6d9075ea5c79a6ea45909cd9d2693a7c..1c44202177e8a443e793410d249416274a6e1078 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -53,7 +53,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


@@ -83,7 +83,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


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

-    WXEXPORT virtual bool Commit() { return m_file->Commit(); }
-    WXEXPORT 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; }


@@ -108,7 +108,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,8 +118,33 @@ 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:
 private:

-    DECLARE_NO_COPY_CLASS(wxFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileStream);

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


@@ -155,7 +180,7 @@ 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
 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream


@@ -185,7 +210,7 @@ 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,
 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,


@@ -193,10 +218,35 @@ 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:
 private:

-    DECLARE_NO_COPY_CLASS(wxFFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileStream);

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