Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/gtk/dataobj2.h b/include/wx/gtk/dataobj2.h
index 8f42fa87039486adc8c56ff04488c59d8e42ddfe..2c05728baafe1d03a336dc95ac6a81d8bd509a49 100644 (file)
--- a/include/wx/gtk/dataobj2.h
+++ b/include/wx/gtk/dataobj2.h
@@ -5,13 +5,13 @@
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_DATAOBJ2_H_
 #define _WX_GTK_DATAOBJ2_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dataobj.h"
 #endif
 
@@ -32,8 +32,6 @@ public:
     // override base class virtual to update PNG data too
     virtual void SetBitmap(const wxBitmap& bitmap);
 
-    void *GetPngData() const { return m_pngData; }
-
     // implement base class pure virtuals
     // ----------------------------------
 
@@ -46,11 +44,19 @@ protected:
     void Clear() { free(m_pngData); }
     void ClearAll() { Clear(); Init(); }
 
-private:
     size_t      m_pngSize;
     void       *m_pngData;
 
     void DoConvertToPng();
+
+private:
+    // virtual function hiding supression
+    size_t GetDataSize(const wxDataFormat& format) const
+        { return(wxDataObjectSimple::GetDataSize(format)); }
+    bool GetDataHere(const wxDataFormat& format, void* pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
+        { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
 };
 
 // ----------------------------------------------------------------------------
@@ -63,9 +69,20 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
+    void AddFile( const wxString &filename );
+
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
+
+private:
+    // virtual function hiding supression
+    size_t GetDataSize(const wxDataFormat& format) const
+        { return(wxDataObjectSimple::GetDataSize(format)); }
+    bool GetDataHere(const wxDataFormat& format, void* pBuf) const
+        { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
+        { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
 };
 
 #endif // _WX_GTK_DATAOBJ2_H_