Fixed compilation error on OS/2 (strnlen declaration was not visible).

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

diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h
index 9672274e2f7edbc0d03e5a19536f13bd883d23c7..74cfa033899e3ed5b8023d1face86fa0365b3d90 100644 (file)
--- a/include/wx/gtk1/dataobj2.h
+++ b/include/wx/gtk1/dataobj2.h
@@ -23,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);


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