X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e08d4efc7e111d6389d5c00b5bd2b5e5afa657e..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/src/mac/_misc_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 0e60ce386e..26bf682611 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -9,7 +9,6 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON -#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -2016,7 +2015,7 @@ IMP_PYCALLBACK_STRING__pure( wxPyTipProvider, wxTipProvider, GetTip); IMP_PYCALLBACK_STRING_STRING(wxPyTipProvider, wxTipProvider, PreprocessTip); -//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); +IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer); @@ -2027,21 +2026,6 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id) } -void wxPyTimer::Notify() { - bool found; - wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "Notify"))) - wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(blocked); - if (! found) - wxTimer::Notify(); -} -void wxPyTimer::base_Notify() { - wxTimer::Notify(); -} - - - SWIGINTERN PyObject * SWIG_FromCharPtr(const char* cptr) { @@ -2259,8 +2243,10 @@ public: wxLog::DoLogString(szString, t); } + DEC_PYCALLBACK_VOID_(Flush); PYPRIVATE; }; +IMP_PYCALLBACK_VOID_(wxPyLog, wxLog, Flush); @@ -3142,7 +3128,6 @@ public: }; #endif -static int wxDisplay_GetFromWindow(wxWindow *window){ wxPyRaiseNotImplemented(); return wxNOT_FOUND; } static PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode=wxDefaultVideoMode){ PyObject* pyList = NULL; wxArrayVideoModes arr = self->GetModes(mode); @@ -9282,6 +9267,31 @@ static PyObject *_wrap_Timer_Stop(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_Timer_Notify(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTimer *arg1 = (wxPyTimer *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_Notify",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTimer, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->Notify(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Timer_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTimer *arg1 = (wxPyTimer *) 0 ; @@ -11882,7 +11892,7 @@ static PyObject *_wrap_Process__setCallbackInfo(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_Process_base_OnTerminate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Process_OnTerminate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyProcess *arg1 = (wxPyProcess *) 0 ; int arg2 ; @@ -11894,7 +11904,7 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *, PyObject *args, PyOb (char *) "self",(char *) "pid",(char *) "status", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Process_base_OnTerminate",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Process_OnTerminate",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyProcess, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -11907,7 +11917,7 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *, PyObject *args, PyOb } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnTerminate(arg2,arg3); + (arg1)->OnTerminate(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30094,7 +30104,7 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DropSource_GiveFeedback(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyDropSource *arg1 = (wxPyDropSource *) 0 ; wxDragResult arg2 ; @@ -30105,7 +30115,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *, PyObject *args, (char *) "self",(char *) "effect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropSource_base_GiveFeedback",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropSource_GiveFeedback",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropSource, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30114,7 +30124,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_GiveFeedback(arg2); + result = (bool)(arg1)->GiveFeedback(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30274,7 +30284,7 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DropTarget_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; int arg2 ; @@ -30289,7 +30299,7 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *, PyObject *args, PyObj (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30306,7 +30316,7 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnEnter(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnEnter(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30318,7 +30328,7 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DropTarget_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; int arg2 ; @@ -30333,7 +30343,7 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30350,7 +30360,7 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnDragOver(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnDragOver(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30362,7 +30372,7 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *, PyObject *args, Py } -static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DropTarget_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; PyObject * obj0 = 0 ; @@ -30370,12 +30380,12 @@ static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *, PyObject *args, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropTarget_base_OnLeave",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DropTarget_OnLeave",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnLeave(); + (arg1)->OnLeave(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30387,7 +30397,7 @@ static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DropTarget_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ; int arg2 ; @@ -30400,7 +30410,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *, PyObject *args, PyObje (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropTarget_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30413,7 +30423,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *, PyObject *args, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_OnDrop(arg2,arg3); + result = (bool)(arg1)->OnDrop(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30572,7 +30582,63 @@ static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *, PyObject *arg } -static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextDropTarget_OnDropText(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; + int arg2 ; + int arg3 ; + wxString *arg4 = 0 ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "text", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnDropText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->OnDropText(arg2,arg3,(wxString const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_TextDropTarget_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; int arg2 ; @@ -30587,7 +30653,7 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *, PyObject *args, P (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30604,7 +30670,7 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnEnter(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnEnter(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30616,7 +30682,7 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *, PyObject *args, P } -static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextDropTarget_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; int arg2 ; @@ -30631,7 +30697,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *, PyObject *args (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30648,7 +30714,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnDragOver(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnDragOver(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30660,7 +30726,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *, PyObject *args } -static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextDropTarget_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; PyObject * obj0 = 0 ; @@ -30668,12 +30734,12 @@ static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextDropTarget_base_OnLeave",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextDropTarget_OnLeave",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnLeave(); + (arg1)->OnLeave(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30685,7 +30751,7 @@ static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *, PyObject *args, P } -static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextDropTarget_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; int arg2 ; @@ -30698,7 +30764,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextDropTarget_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30711,7 +30777,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_OnDrop(arg2,arg3); + result = (bool)(arg1)->OnDrop(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30725,7 +30791,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *, PyObject *args, Py } -static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_TextDropTarget_OnData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ; int arg2 ; @@ -30740,7 +30806,7 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTextDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30757,7 +30823,7 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnData(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnData(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30829,7 +30895,73 @@ static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *, PyObject *arg } -static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FileDropTarget_OnDropFiles(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; + int arg2 ; + int arg3 ; + wxArrayString *arg4 = 0 ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "filenames", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnDropFiles",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + { + if (! PySequence_Check(obj3)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg4 = new wxArrayString; + temp4 = true; + int i, len=PySequence_Length(obj3); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->OnDropFiles(arg2,arg3,(wxArrayString const &)*arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) delete arg4; + } + return resultobj; + fail: + { + if (temp4) delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_FileDropTarget_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; int arg2 ; @@ -30844,7 +30976,7 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *, PyObject *args, P (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30861,7 +30993,7 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnEnter(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnEnter(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30873,7 +31005,7 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *, PyObject *args, P } -static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FileDropTarget_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; int arg2 ; @@ -30888,7 +31020,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *, PyObject *args (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30905,7 +31037,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnDragOver(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnDragOver(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30917,7 +31049,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *, PyObject *args } -static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FileDropTarget_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; PyObject * obj0 = 0 ; @@ -30925,12 +31057,12 @@ static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileDropTarget_base_OnLeave",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileDropTarget_OnLeave",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnLeave(); + (arg1)->OnLeave(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30942,7 +31074,7 @@ static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *, PyObject *args, P } -static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FileDropTarget_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; int arg2 ; @@ -30955,7 +31087,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileDropTarget_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -30968,7 +31100,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_OnDrop(arg2,arg3); + result = (bool)(arg1)->OnDrop(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -30982,7 +31114,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *, PyObject *args, Py } -static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_FileDropTarget_OnData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ; int arg2 ; @@ -30997,7 +31129,7 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyFileDropTarget, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -31014,7 +31146,7 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDragResult)(arg1)->base_OnData(arg2,arg3,arg4); + result = (wxDragResult)(arg1)->OnData(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -32138,7 +32270,7 @@ static PyObject *_wrap_Display_GetFromWindow(PyObject *, PyObject *args, PyObjec if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxDisplay_GetFromWindow(arg1); + result = (int)wxDisplay::GetFromWindow(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -32924,6 +33056,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Timer_GetOwner", (PyCFunction) _wrap_Timer_GetOwner, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Timer_Start", (PyCFunction) _wrap_Timer_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Timer_Stop", (PyCFunction) _wrap_Timer_Stop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Timer_Notify", (PyCFunction) _wrap_Timer_Notify, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Timer_IsRunning", (PyCFunction) _wrap_Timer_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Timer_GetInterval", (PyCFunction) _wrap_Timer_GetInterval, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Timer_IsOneShot", (PyCFunction) _wrap_Timer_IsOneShot, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33013,7 +33146,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Process_base_OnTerminate", (PyCFunction) _wrap_Process_base_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Process_OnTerminate", (PyCFunction) _wrap_Process_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Process_Redirect", (PyCFunction) _wrap_Process_Redirect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Process_IsRedirected", (PyCFunction) _wrap_Process_IsRedirected, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Process_Detach", (PyCFunction) _wrap_Process_Detach, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33492,36 +33625,38 @@ static PyMethodDef SwigMethods[] = { { (char *)"DropSource_GetDataObject", (PyCFunction) _wrap_DropSource_GetDataObject, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropSource_SetCursor", (PyCFunction) _wrap_DropSource_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropSource_GiveFeedback", (PyCFunction) _wrap_DropSource_GiveFeedback, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS, NULL}, { (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_SetDataObject", (PyCFunction) _wrap_DropTarget_SetDataObject, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DropTarget_base_OnEnter", (PyCFunction) _wrap_DropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DropTarget_base_OnDragOver", (PyCFunction) _wrap_DropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DropTarget_base_OnLeave", (PyCFunction) _wrap_DropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DropTarget_base_OnDrop", (PyCFunction) _wrap_DropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_OnEnter", (PyCFunction) _wrap_DropTarget_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_OnDragOver", (PyCFunction) _wrap_DropTarget_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_OnLeave", (PyCFunction) _wrap_DropTarget_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DropTarget_OnDrop", (PyCFunction) _wrap_DropTarget_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_GetData", (PyCFunction) _wrap_DropTarget_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_SetDefaultAction", (PyCFunction) _wrap_DropTarget_SetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_GetDefaultAction", (PyCFunction) _wrap_DropTarget_GetDefaultAction, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DropTarget_swigregister", DropTarget_swigregister, METH_VARARGS, NULL}, { (char *)"new_TextDropTarget", (PyCFunction) _wrap_new_TextDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextDropTarget__setCallbackInfo", (PyCFunction) _wrap_TextDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TextDropTarget_base_OnEnter", (PyCFunction) _wrap_TextDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TextDropTarget_base_OnDragOver", (PyCFunction) _wrap_TextDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TextDropTarget_base_OnLeave", (PyCFunction) _wrap_TextDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TextDropTarget_base_OnDrop", (PyCFunction) _wrap_TextDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"TextDropTarget_base_OnData", (PyCFunction) _wrap_TextDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnDropText", (PyCFunction) _wrap_TextDropTarget_OnDropText, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnEnter", (PyCFunction) _wrap_TextDropTarget_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnDragOver", (PyCFunction) _wrap_TextDropTarget_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnLeave", (PyCFunction) _wrap_TextDropTarget_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnDrop", (PyCFunction) _wrap_TextDropTarget_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TextDropTarget_OnData", (PyCFunction) _wrap_TextDropTarget_OnData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TextDropTarget_swigregister", TextDropTarget_swigregister, METH_VARARGS, NULL}, { (char *)"new_FileDropTarget", (PyCFunction) _wrap_new_FileDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FileDropTarget__setCallbackInfo", (PyCFunction) _wrap_FileDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FileDropTarget_base_OnEnter", (PyCFunction) _wrap_FileDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FileDropTarget_base_OnDragOver", (PyCFunction) _wrap_FileDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FileDropTarget_base_OnLeave", (PyCFunction) _wrap_FileDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FileDropTarget_base_OnDrop", (PyCFunction) _wrap_FileDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FileDropTarget_base_OnData", (PyCFunction) _wrap_FileDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnDropFiles", (PyCFunction) _wrap_FileDropTarget_OnDropFiles, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnEnter", (PyCFunction) _wrap_FileDropTarget_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnDragOver", (PyCFunction) _wrap_FileDropTarget_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnLeave", (PyCFunction) _wrap_FileDropTarget_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnDrop", (PyCFunction) _wrap_FileDropTarget_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"FileDropTarget_OnData", (PyCFunction) _wrap_FileDropTarget_OnData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FileDropTarget_swigregister", FileDropTarget_swigregister, METH_VARARGS, NULL}, { (char *)"new_Clipboard", (PyCFunction) _wrap_new_Clipboard, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_Clipboard", (PyCFunction) _wrap_delete_Clipboard, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35561,6 +35696,9 @@ SWIGEXPORT void SWIG_init(void) { { PyDict_SetItemString(d,"SYS_CAN_ICONIZE_FRAME", SWIG_From_int(static_cast(wxSYS_CAN_ICONIZE_FRAME))); } + { + PyDict_SetItemString(d,"SYS_TABLET_PRESENT", SWIG_From_int(static_cast(wxSYS_TABLET_PRESENT))); + } { PyDict_SetItemString(d,"SYS_SCREEN_NONE", SWIG_From_int(static_cast(wxSYS_SCREEN_NONE))); }