reSWIGged

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

diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index 19a9494430d2021d60d17dc721497a68883b3f6e..cf7c3c84b946b9a00101a4264a627539ea73e02d 100644 (file)
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -118,7 +118,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop);
 %name(DropTarget) class wxPyDropTarget // : public wxDropTarget
 {
 public:
 %name(DropTarget) class wxPyDropTarget // : public wxDropTarget
 {
 public:

-    %addtofunc wxPyDropTarget
+    %pythonAppend wxPyDropTarget

        "self._setCallbackInfo(self, DropTarget)"
     %apply SWIGTYPE *DISOWN { wxDataObject *dataObject };
 
        "self._setCallbackInfo(self, DropTarget)"
     %apply SWIGTYPE *DISOWN { wxDataObject *dataObject };
 


@@ -180,7 +180,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop);
 
 %name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget {
 public:
 
 %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);
 
     wxPyTextDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);


@@ -217,13 +217,13 @@ public:
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {
     bool rval = False;
 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);
     }
     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;
 }
 
     return rval;
 }
 


@@ -241,7 +241,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop);
 %name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget
 {
 public:
 %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);
 
     wxPyFileDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);