Update to Scintilla 1.48

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

diff --git a/include/wx/mac/dataform.h b/include/wx/mac/dataform.h
index d052bf4e0ce67d238c825019183f2f852f1565d5..d9267a9981fb0e6bbd9c70f874a0e99d79f1b9bc 100644 (file)
--- a/include/wx/mac/dataform.h
+++ b/include/wx/mac/dataform.h
@@ -1,22 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        os2/dataform.h
+// Name:        mac/dataform.h
 // Purpose:     declaration of the wxDataFormat class
-// Author:      David Webster (lifted from dnd.h)
+// Author:      Stefan Csomor (lifted from dnd.h)
 // Modified by:
 // Created:     10/21/99
 // RCS-ID:      $Id$
-// Copyright:   (c) 1999 David Webster
+// Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_OS2_DATAFORM_H
-#define _WX_OS2_DATAFORM_H
+#ifndef _WX_MAC_DATAFORM_H
+#define _WX_MAC_DATAFORM_H
 
 class wxDataFormat
 {
 public:
-    // the clipboard formats under GDK are GdkAtoms
-    typedef unsigned short NativeFormat;
+    typedef unsigned long NativeFormat;
 
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
@@ -28,18 +27,22 @@ public:
         { SetId(vFormat); return *this; }
 
     // comparison (must have both versions)
-    bool operator==(NativeFormat vFormat) const
-        { return m_vFormat == (NativeFormat)vFormat; }
-    bool operator!=(NativeFormat vFormat) const
-        { return m_vFormat != (NativeFormat)vFormat; }
+    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_vFormat; }
-    operator NativeFormat() const { return m_vFormat; }
+    NativeFormat GetFormatId() const { return m_format; }
+    operator NativeFormat() const { return m_format; }
 
-    void SetId(NativeFormat vFormat);
+    void SetId(NativeFormat format);
 
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
@@ -48,13 +51,11 @@ public:
 
     // implementation
     wxDataFormatId GetType() const;
+    void SetType( wxDataFormatId type );
 
 private:
-    wxDataFormatId                  m_vType;
-    NativeFormat                    m_vFormat;
-
-    void PrepareFormats();
-    void SetType(wxDataFormatId vType);
+    wxDataFormatId   m_type;
+    NativeFormat     m_format;
 };
 
-#endif // _WX_GTK_DATAFORM_H
+#endif // _WX_MAC_DATAFORM_H