X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..a2b9e9520297da0f7d13e4cc2e36acdf2bda105d:/include/wx/mac/dataobj2.h

diff --git a/include/wx/mac/dataobj2.h b/include/wx/mac/dataobj2.h
index 744aa141ae..64b0ac084a 100644
--- a/include/wx/mac/dataobj2.h
+++ b/include/wx/mac/dataobj2.h
@@ -6,13 +6,13 @@
 // Created:     10/21/99
 // 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dataobj.h"
 #endif
 
@@ -20,7 +20,7 @@
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 // ----------------------------------------------------------------------------
 
-class wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -36,20 +36,16 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetDataSize() const { return m_pngSize; }
-    virtual bool GetDataHere(void *buf) const;
+    virtual size_t GetDataSize() const ;
+    virtual bool GetDataHere(void *buf) const ;
     virtual bool SetData(size_t len, const void *buf);
 
-protected:
-    void Init() { m_pngData = (void *)NULL; m_pngSize = 0; }
-    void Clear() { free(m_pngData); }
-    void ClearAll() { Clear(); Init(); }
-
-    size_t      m_pngSize;
-    void       *m_pngData;
-
-    void DoConvertToPng();
+protected :
+    void Init() ;
+    void Clear() ;
 
+    void* m_pictHandle ;
+    bool m_pictCreated ;
 private:
     // Virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& rFormat) const
@@ -64,7 +60,7 @@ private:
 // wxFileDataObject is a specialization of wxDataObject for file names
 // ----------------------------------------------------------------------------
 
-class wxFileDataObject : public wxFileDataObjectBase
+class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
 {
 public:
     // implement base class pure virtuals