X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c74e7fe1de14f32dcd6f3c9cdd727de540bbd0e..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/os2/dataobj2.h diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h index 3108a1d37e..b3e3d319d4 100644 --- a/include/wx/os2/dataobj2.h +++ b/include/wx/os2/dataobj2.h @@ -1,26 +1,21 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: mac/dataobj2.h +// Name: wx/os2/dataobj2.h // Purpose: declaration of standard wxDataObjectSimple-derived classes // Author: Stefan Csomor (adapted from Robert Roebling's gtk port // Modified by: // Created: 10/21/99 -// RCS-ID: $Id$ // Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef _WX_MAC_DATAOBJ2_H_ -#define _WX_MAC_DATAOBJ2_H_ - -#ifdef __GNUG__ - #pragma interface "dataobj.h" -#endif +#ifndef _WX_OS2_DATAOBJ2_H_ +#define _WX_OS2_DATAOBJ2_H_ // ---------------------------------------------------------------------------- // wxBitmapDataObject is a specialization of wxDataObject for bitmaps // ---------------------------------------------------------------------------- -class wxBitmapDataObject : public wxBitmapDataObjectBase +class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase { public: // ctors @@ -28,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); @@ -41,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(); } @@ -86,5 +81,4 @@ private: { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); } }; -#endif // _WX_MAC_DATAOBJ2_H_ - +#endif // _WX_OS2_DATAOBJ2_H_