diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 9389a99765..ae5a2c232b 100644
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -33,15 +33,18 @@ public:
     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
 
-    // comparison (must have both versions)
+    // comparison (note that we rely on implicit conversions for comparison
+    // with wxDataFormatId, but have to provide them explicitly for comparison
+    // with NativeFormat to avoid ambiguity between comparing from it to
+    // wxDataFormat or vice versa)
     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; }
+    bool operator==(const wxDataFormat& other) const
+        { return m_format == other.m_format; }
+    bool operator!=(const wxDataFormat& other) const
+        { return m_format != other.m_format; }
 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the