X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f364be84b91d4e19729634ebf0b119145303a35..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/gtk1/dataobj2.h?ds=sidebyside diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h index 8f42fa8703..b118ece2f2 100644 --- a/include/wx/gtk1/dataobj2.h +++ b/include/wx/gtk1/dataobj2.h @@ -32,8 +32,6 @@ public: // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); - void *GetPngData() const { return m_pngData; } - // implement base class pure virtuals // ---------------------------------- @@ -46,11 +44,19 @@ protected: void Clear() { free(m_pngData); } void ClearAll() { Clear(); Init(); } -private: size_t m_pngSize; void *m_pngData; void DoConvertToPng(); + +private: + // virtual function hiding supression + size_t GetDataSize(const wxDataFormat& format) const + { return(wxDataObjectSimple::GetDataSize(format)); } + bool GetDataHere(const wxDataFormat& format, void* pBuf) const + { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } + bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) + { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } }; // ---------------------------------------------------------------------------- @@ -63,9 +69,20 @@ public: // implement base class pure virtuals // ---------------------------------- + void AddFile( const wxString &filename ); + virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + +private: + // virtual function hiding supression + size_t GetDataSize(const wxDataFormat& format) const + { return(wxDataObjectSimple::GetDataSize(format)); } + bool GetDataHere(const wxDataFormat& format, void* pBuf) const + { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } + bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) + { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } }; #endif // _WX_GTK_DATAOBJ2_H_