From dc21f4bbb077af21c813b5794f0ba4ad05bc3bd2 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 11 Jan 2008 19:17:46 +0000
Subject: [PATCH] adding old 'pict' support to quartz mode for receiving
 bitmapobjs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/mac/carbon/dataobj2.h | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/wx/mac/carbon/dataobj2.h b/include/wx/mac/carbon/dataobj2.h
index b647d2a465..98519524d0 100644
--- a/include/wx/mac/carbon/dataobj2.h
+++ b/include/wx/mac/carbon/dataobj2.h
@@ -35,20 +35,15 @@ public:
     virtual size_t GetDataSize() const ;
     virtual bool GetDataHere(void *buf) const ;
     virtual bool SetData(size_t len, const void *buf);
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
 
+    // virtuals, we aren't breaking binary compat here
+    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const;
+    virtual void GetAllFormats(wxDataFormat *formats,
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const;
+
+    virtual size_t GetDataSize(const wxDataFormat& format) const;
+    virtual bool GetDataHere(const wxDataFormat& format, void *pBuf) const;
+    virtual bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf);
 protected :
     void Init() ;
     void Clear() ;