X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f87da7220560e2f1a57e4e291cc75341f0ff1abe..3bcdbe527fde583072eefab67de8974c0e17a1e2:/wxPython/src/_dnd.i diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i index 20d64d671b..cf7c3c84b9 100644 --- a/wxPython/src/_dnd.i +++ b/wxPython/src/_dnd.i @@ -58,12 +58,12 @@ IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback); %name(DropSource) class wxPyDropSource { public: #ifndef __WXGTK__ - wxPyDropSource(wxWindow *win = NULL, + wxPyDropSource(wxWindow *win, const wxCursor © = wxNullCursor, const wxCursor &move = wxNullCursor, const wxCursor &none = wxNullCursor); #else - wxPyDropSource(wxWindow *win = NULL, + wxPyDropSource(wxWindow *win, const wxIcon& copy = wxNullIcon, const wxIcon& move = wxNullIcon, const wxIcon& none = wxNullIcon); @@ -118,9 +118,9 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop); %name(DropTarget) class wxPyDropTarget // : public wxDropTarget { public: - %addtofunc wxPyDropTarget - "if args: args[0].thisown = 0; - self._setCallbackInfo(self, DropTarget)" + %pythonAppend wxPyDropTarget + "self._setCallbackInfo(self, DropTarget)" + %apply SWIGTYPE *DISOWN { wxDataObject *dataObject }; wxPyDropTarget(wxDataObject *dataObject = NULL); void _setCallbackInfo(PyObject* self, PyObject* _class); @@ -129,9 +129,10 @@ public: // get/set the associated wxDataObject wxDataObject *GetDataObject(); - %addtofunc SetDataObject "args[1].thisown = 0" void SetDataObject(wxDataObject *dataObject); + %clear wxDataObject *dataObject; + wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def); wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def); void base_OnLeave(); @@ -179,7 +180,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop); %name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget { public: - %addtofunc wxPyTextDropTarget "self._setCallbackInfo(self, TextDropTarget)" + %pythonAppend wxPyTextDropTarget "self._setCallbackInfo(self, TextDropTarget)" wxPyTextDropTarget(); void _setCallbackInfo(PyObject* self, PyObject* _class); @@ -216,13 +217,13 @@ public: bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) { bool rval = False; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) { PyObject* list = wxArrayString2PyList_helper(filenames); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list)); Py_DECREF(list); } - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return rval; } @@ -240,7 +241,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop); %name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget { public: - %addtofunc wxPyFileDropTarget "self._setCallbackInfo(self, FileDropTarget)" + %pythonAppend wxPyFileDropTarget "self._setCallbackInfo(self, FileDropTarget)" wxPyFileDropTarget(); void _setCallbackInfo(PyObject* self, PyObject* _class);