X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/motif/dataobj2.h diff --git a/include/wx/motif/dataobj2.h b/include/wx/motif/dataobj2.h index 840586a1e5..c80d8c6b65 100644 --- a/include/wx/motif/dataobj2.h +++ b/include/wx/motif/dataobj2.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: include/wx/motif/dataobj2.h +// Name: wx/motif/dataobj2.h // Purpose: declaration of standard wxDataObjectSimple-derived classes // Author: Mattia Barbon // Created: 27.04.03 @@ -11,15 +11,11 @@ #ifndef _WX_MOTIF_DATAOBJ2_H_ #define _WX_MOTIF_DATAOBJ2_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dataobj.h" -#endif - // ---------------------------------------------------------------------------- // wxBitmapDataObject is a specialization of wxDataObject for bitmaps // ---------------------------------------------------------------------------- -class wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -33,7 +29,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_ -