Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/dataobj2.h b/include/wx/os2/dataobj2.h
index 548b13b978a613aee68442daa07952c778e75309..b3e3d319d4ab60f2c30699d87fbe6c8e68f5ab43 100644 (file)
--- a/include/wx/os2/dataobj2.h
+++ b/include/wx/os2/dataobj2.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor (adapted from Robert Roebling's gtk port
 // Modified by:
 // Created:     10/21/99
 // 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 licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -24,7 +23,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 +36,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(); }