X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..74c481d11721fb42343c6b79996478a2ebacde3a:/include/wx/msw/ole/dataobj2.h diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 2444d0b1da..f69c376127 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -38,6 +38,15 @@ public: virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + private: // the DIB data void /* BITMAPINFO */ *m_data; @@ -64,6 +73,18 @@ public: virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + +private: + DECLARE_NO_COPY_CLASS(wxBitmapDataObject2) }; // ---------------------------------------------------------------------------- @@ -73,11 +94,25 @@ public: class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase { public: + wxFileDataObject() { } + // implement base class pure virtuals virtual bool SetData(size_t len, const void *buf); virtual size_t GetDataSize() const; virtual bool GetDataHere(void *pData) const; virtual void AddFile(const wxString& file); + + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + +private: + DECLARE_NO_COPY_CLASS(wxFileDataObject) }; // ----------------------------------------------------------------------------