Oops, I left an extra { in there.

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

diff --git a/include/wx/mac/dataobj2.h b/include/wx/mac/dataobj2.h
index c6fd53689c9df909f3fe068deda83938a672805e..64b0ac084a2eab75266869ba0f4494b2e11bf2df 100644 (file)
--- 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
 // 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_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #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
 
     #pragma interface "dataobj.h"
 #endif
 


@@ -36,20 +36,16 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // 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);
 
     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
 private:
     // Virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& rFormat) const