Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / os2 / dataobj2.h

diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h
index 144e7911c365db017234a730a6b707bb8688db30..a05e2d6478fb02537b6ea2f0a34cd40cc00ed68c 100644 (file)
--- a/include/wx/os2/dataobj2.h
+++ b/include/wx/os2/dataobj2.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// 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:
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Stefan Csomor (adapted from Robert Roebling's gtk port
 // Modified by:


@@ -9,14 +9,14 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_MAC_DATAOBJ2_H_
-#define _WX_MAC_DATAOBJ2_H_
+#ifndef _WX_OS2_DATAOBJ2_H_
+#define _WX_OS2_DATAOBJ2_H_

 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 

-class wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -24,7 +24,7 @@ public:
     wxBitmapDataObject(const wxBitmap& bitmap);
 
     // destr
     wxBitmapDataObject(const wxBitmap& bitmap);
 
     // destr

-    ~wxBitmapDataObject();
+    virtual ~wxBitmapDataObject();

 
     // override base class virtual to update PNG data too
     virtual void SetBitmap(const wxBitmap& bitmap);
 
     // override base class virtual to update PNG data too
     virtual void SetBitmap(const wxBitmap& bitmap);


@@ -37,7 +37,7 @@ public:
     virtual bool SetData(size_t len, const void *buf);
 
 protected:
     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(); }
 
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 


@@ -82,5 +82,4 @@ private:
     { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
 };
 
     { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
 };
 

-#endif // _WX_MAC_DATAOBJ2_H_
-
+#endif // _WX_OS2_DATAOBJ2_H_