reSWIGged with the new SWIG runtime and also other recent changes

[wxWidgets.git] / wxPython / src / _dataobj.i

diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index 2f0896a2080aafa780d8cebc148dccfc331f5701..7a52a473055b79f925efd25bca8c8615e1f6bb6d 100644 (file)
--- a/wxPython/src/_dataobj.i
+++ b/wxPython/src/_dataobj.i
@@ -57,8 +57,8 @@ public:
 
     %nokwargs operator==;
     %nokwargs operator!=;
-    bool operator==(wxDataFormatId format) const;
-    bool operator!=(wxDataFormatId format) const;
+    bool operator==(int /*wxDataFormatId*/ format) const;
+    bool operator!=(int /*wxDataFormatId*/ format) const;
     bool operator==(const wxDataFormat& format) const;
     bool operator!=(const wxDataFormat& format) const;
 
@@ -424,7 +424,7 @@ public:
 
 //---------------------------------------------------------------------------
 
-#if !defined(__WXGTK__) && !defined(__WXX11__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
 
 %{
 #include <wx/metafile.h>