X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6b30ffedb18b86329fdc41ac1be27bc85bd758ff:/include/wx/cocoa/dataobj2.h?ds=sidebyside diff --git a/include/wx/cocoa/dataobj2.h b/include/wx/cocoa/dataobj2.h index a447bb72e1..a1d1ea3e25 100644 --- a/include/wx/cocoa/dataobj2.h +++ b/include/wx/cocoa/dataobj2.h @@ -6,7 +6,7 @@ // Created: 2003/07/23 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_DATAOBJ2_H__ @@ -15,7 +15,7 @@ //========================================================================= // wxBitmapDataObject is a specialization of wxDataObject for bitmaps //========================================================================= -class wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -23,7 +23,7 @@ public: wxBitmapDataObject(const wxBitmap& bitmap); // destr - ~wxBitmapDataObject(); + virtual ~wxBitmapDataObject(); // override base class virtual to update PNG data too virtual void SetBitmap(const wxBitmap& bitmap); @@ -36,7 +36,7 @@ public: virtual bool SetData(size_t len, const void *buf); 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(); } @@ -59,7 +59,7 @@ private: // wxFileDataObject is a specialization of wxDataObject for file names //========================================================================= -class wxFileDataObject : public wxFileDataObjectBase +class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase { public: // implement base class pure virtuals