Move wxColourData and wxFontData into separate files.

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

diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h
index 548b13b978a613aee68442daa07952c778e75309..a05e2d6478fb02537b6ea2f0a34cd40cc00ed68c 100644 (file)
--- a/include/wx/os2/dataobj2.h
+++ b/include/wx/os2/dataobj2.h
@@ -24,7 +24,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);
@@ -37,7 +37,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(); }