ConvertToImage: Check !Ok() (we may not have any ref data at all) and if

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

diff --git a/wxPython/src/_dataobj.i b/wxPython/src/_dataobj.i
index 191ca7a74bfbbd05de8e47bd6e60c16cabc82b09..8dacc168d8588d278f4b6e8c80067efa2068cfac 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;
 
@@ -240,8 +240,9 @@ class wxDataObjectComposite : public wxDataObject {
 public:
     wxDataObjectComposite();
 
-    %addtofunc Add "args[1].thisown = 0"
+    %apply SWIGTYPE *DISOWN { wxDataObjectSimple *dataObject };
     void Add(wxDataObjectSimple *dataObject, int preferred = False);
+    %clear wxDataObjectSimple *dataObject;
 };
 
 //---------------------------------------------------------------------------
@@ -424,7 +425,7 @@ public:
 
 //---------------------------------------------------------------------------
 
-#ifndef __WXGTK__
+#if defined(__WXMSW__) || defined(__WXMAC__)
 
 %{
 #include <wx/metafile.h>