X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd38c87578df7a24a491401c943988e2bc89b62b..0944fceb987def04dc89d03d58c35793d0ecdfed:/include/wx/motif/dataobj2.h diff --git a/include/wx/motif/dataobj2.h b/include/wx/motif/dataobj2.h index 3bd2a50a3f..4226e32d48 100644 --- a/include/wx/motif/dataobj2.h +++ b/include/wx/motif/dataobj2.h @@ -11,7 +11,7 @@ #ifndef _WX_MOTIF_DATAOBJ2_H_ #define _WX_MOTIF_DATAOBJ2_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dataobj.h" #endif @@ -19,7 +19,7 @@ // wxBitmapDataObject is a specialization of wxDataObject for bitmaps // ---------------------------------------------------------------------------- -class wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -33,6 +33,16 @@ public: virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + + // unhide base class virtual functions + 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); } }; #endif // _WX_MOTIF_DATAOBJ2_H_