Reapply wxWeakRef patch again

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

diff --git a/include/wx/mac/dataform.h b/include/wx/mac/dataform.h
index 3492479d268ea3efc3368e400150aedffdf98cbf..e4a953d14ab0fdc0d8b4003e9dd2d1d4eea98e05 100644 (file)
--- a/include/wx/mac/dataform.h
+++ b/include/wx/mac/dataform.h
@@ -1,61 +1,5 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        mac/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      Stefan Csomor (lifted from dnd.h)
-// Modified by:
-// Created:     10/21/99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_DATAFORM_H
-#define _WX_MAC_DATAFORM_H
-
-class wxDataFormat
-{
-public:
-    typedef OSType NativeFormat;
-
-    wxDataFormat();
-    wxDataFormat(wxDataFormatId vType);
-    wxDataFormat(const wxString& rId);
-    wxDataFormat(const wxChar* pId);
-    wxDataFormat(NativeFormat vFormat);
-
-    wxDataFormat& operator=(NativeFormat vFormat)
-        { SetId(vFormat); return *this; }
-
-    // comparison (must have both versions)
-    bool operator==(NativeFormat format) const
-        { return m_format == (NativeFormat)format; }
-    bool operator!=(NativeFormat format) const
-        { return m_format != (NativeFormat)format; }
-    bool operator==(wxDataFormatId format) const
-        { return m_type == (wxDataFormatId)format; }
-    bool operator!=(wxDataFormatId format) const
-        { return m_type != (wxDataFormatId)format; }
-
-    // explicit and implicit conversions to NativeFormat which is one of
-    // standard data types (implicit conversion is useful for preserving the
-    // compatibility with old code)
-    NativeFormat GetFormatId() const { return m_format; }
-    operator NativeFormat() const { return m_format; }
-
-    void SetId(NativeFormat format);
-
-    // string ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    wxString GetId() const;
-    void SetId(const wxChar* pId);
-
-    // implementation
-    wxDataFormatId GetType() const;
-    void SetType( wxDataFormatId type );
-
-private:
-    wxDataFormatId   m_type;
-    NativeFormat     m_format;
-};
-
-#endif // _WX_MAC_DATAFORM_H
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/dataform.h"
+#else
+#include "wx/mac/carbon/dataform.h"
+#endif