X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d613be55db6d1100cf38e3c9f666f7ced4db6b65..51181d291194b7ae616cfb17c984fd8927e4a977:/include/wx/gtk/dataobj2.h?ds=inline diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h index 250305b177..b820f1c22c 100644 --- a/include/wx/gtk/dataobj2.h +++ b/include/wx/gtk/dataobj2.h @@ -49,7 +49,7 @@ public: } protected: - void Init() { m_pngData = (void *)NULL; m_pngSize = 0; } + void Init() { m_pngData = NULL; m_pngSize = 0; } void Clear() { free(m_pngData); } void ClearAll() { Clear(); Init(); } @@ -100,13 +100,27 @@ public: wxString GetURL() const { return m_url; } void SetURL(const wxString& url) { m_url = url; } - -private: - wxString m_url; virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + + // Must provide overloads to avoid hiding them (and warnings about it) + virtual size_t GetDataSize(const wxDataFormat&) const + { + return GetDataSize(); + } + virtual bool GetDataHere(const wxDataFormat&, void *buf) const + { + return GetDataHere(buf); + } + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) + { + return SetData(len, buf); + } + +private: + wxString m_url; };