From 6b449b1967cbe19be6fe774ac9ae71baf34aacf1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Oct 2006 01:55:29 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_core.py | 15 +++++++-------- wxPython/src/gtk/_windows.py | 7 ++++--- wxPython/src/gtk/_windows_wrap.cpp | 10 +++++----- wxPython/src/mac/_core.py | 15 +++++++-------- wxPython/src/mac/_windows.py | 7 ++++--- wxPython/src/mac/_windows_wrap.cpp | 10 +++++----- wxPython/src/msw/_core.py | 15 +++++++-------- wxPython/src/msw/_windows.py | 7 ++++--- wxPython/src/msw/_windows_wrap.cpp | 10 +++++----- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 881b0030de..660573487a 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -4015,14 +4015,13 @@ class Event(Object): """ Skip(self, bool skip=True) - Called by an event handler, it controls whether additional event - handlers bound to this event will be called after the current event - handler returns. Skip(false) (the default setting) will prevent - additional event handlers from being called and control will be - returned to the sender of the event immediately after the current - handler has finished. Skip(True) will cause the event processing - system to continue searching for a handler function for this event. - + This method can be used inside an event handler to control whether + further event handlers bound to this event will be called after the + current one returns. Without Skip() (or equivalently if Skip(False) is + used), the event will not be processed any more. If Skip(True) is + called, the event processing system continues searching for a further + handler function for this event, even though it has been processed + already in the current handler. """ return _core_.Event_Skip(*args, **kwargs) diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index a3a8d39f50..f556413750 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -2900,16 +2900,17 @@ class ProgressDialog(Frame): """ return _windows_.ProgressDialog_Update(*args, **kwargs) - def UpdatePulse(*args, **kwargs): + def Pulse(*args, **kwargs): """ - UpdatePulse(self, String newmsg) --> (continue, skip) + Pulse(self, String newmsg) --> (continue, skip) Just like `Update` but switches the dialog to use a gauge in interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of progress. """ - return _windows_.ProgressDialog_UpdatePulse(*args, **kwargs) + return _windows_.ProgressDialog_Pulse(*args, **kwargs) + UpdatePulse = Pulse def Resume(*args, **kwargs): """ Resume(self) diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index c325b21dff..7d2f39c2c5 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -19590,7 +19590,7 @@ fail: } -SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_ProgressDialog_Pulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxProgressDialog *arg1 = (wxProgressDialog *) 0 ; wxString const &arg2_defvalue = wxPyEmptyString ; @@ -19609,10 +19609,10 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s }; arg3 = &temp3; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_UpdatePulse",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_Pulse",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxProgressDialog, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_UpdatePulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_Pulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); } arg1 = reinterpret_cast< wxProgressDialog * >(argp1); if (obj1) { @@ -19624,7 +19624,7 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->UpdatePulse((wxString const &)*arg2,arg3); + result = (bool)(arg1)->Pulse((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -31361,7 +31361,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MessageDialog_swiginit", MessageDialog_swiginit, METH_VARARGS, NULL}, { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ProgressDialog_UpdatePulse", (PyCFunction) _wrap_ProgressDialog_UpdatePulse, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ProgressDialog_Pulse", (PyCFunction) _wrap_ProgressDialog_Pulse, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Resume", (PyCFunction)_wrap_ProgressDialog_Resume, METH_O, NULL}, { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL}, { (char *)"ProgressDialog_swiginit", ProgressDialog_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 881b0030de..660573487a 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -4015,14 +4015,13 @@ class Event(Object): """ Skip(self, bool skip=True) - Called by an event handler, it controls whether additional event - handlers bound to this event will be called after the current event - handler returns. Skip(false) (the default setting) will prevent - additional event handlers from being called and control will be - returned to the sender of the event immediately after the current - handler has finished. Skip(True) will cause the event processing - system to continue searching for a handler function for this event. - + This method can be used inside an event handler to control whether + further event handlers bound to this event will be called after the + current one returns. Without Skip() (or equivalently if Skip(False) is + used), the event will not be processed any more. If Skip(True) is + called, the event processing system continues searching for a further + handler function for this event, even though it has been processed + already in the current handler. """ return _core_.Event_Skip(*args, **kwargs) diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 7e3edded6f..8ad5e129ee 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -2880,16 +2880,17 @@ class ProgressDialog(Frame): """ return _windows_.ProgressDialog_Update(*args, **kwargs) - def UpdatePulse(*args, **kwargs): + def Pulse(*args, **kwargs): """ - UpdatePulse(self, String newmsg) --> (continue, skip) + Pulse(self, String newmsg) --> (continue, skip) Just like `Update` but switches the dialog to use a gauge in interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of progress. """ - return _windows_.ProgressDialog_UpdatePulse(*args, **kwargs) + return _windows_.ProgressDialog_Pulse(*args, **kwargs) + UpdatePulse = Pulse def Resume(*args, **kwargs): """ Resume(self) diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 43dfcf5712..38a8b63b62 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -19454,7 +19454,7 @@ fail: } -SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_ProgressDialog_Pulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxProgressDialog *arg1 = (wxProgressDialog *) 0 ; wxString const &arg2_defvalue = wxPyEmptyString ; @@ -19473,10 +19473,10 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s }; arg3 = &temp3; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_UpdatePulse",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_Pulse",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxProgressDialog, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_UpdatePulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_Pulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); } arg1 = reinterpret_cast< wxProgressDialog * >(argp1); if (obj1) { @@ -19488,7 +19488,7 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->UpdatePulse((wxString const &)*arg2,arg3); + result = (bool)(arg1)->Pulse((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -31222,7 +31222,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MessageDialog_swiginit", MessageDialog_swiginit, METH_VARARGS, NULL}, { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ProgressDialog_UpdatePulse", (PyCFunction) _wrap_ProgressDialog_UpdatePulse, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ProgressDialog_Pulse", (PyCFunction) _wrap_ProgressDialog_Pulse, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Resume", (PyCFunction)_wrap_ProgressDialog_Resume, METH_O, NULL}, { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL}, { (char *)"ProgressDialog_swiginit", ProgressDialog_swiginit, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 81c9364b07..8d9e194b4b 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -4015,14 +4015,13 @@ class Event(Object): """ Skip(self, bool skip=True) - Called by an event handler, it controls whether additional event - handlers bound to this event will be called after the current event - handler returns. Skip(false) (the default setting) will prevent - additional event handlers from being called and control will be - returned to the sender of the event immediately after the current - handler has finished. Skip(True) will cause the event processing - system to continue searching for a handler function for this event. - + This method can be used inside an event handler to control whether + further event handlers bound to this event will be called after the + current one returns. Without Skip() (or equivalently if Skip(False) is + used), the event will not be processed any more. If Skip(True) is + called, the event processing system continues searching for a further + handler function for this event, even though it has been processed + already in the current handler. """ return _core_.Event_Skip(*args, **kwargs) diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 20f481b11b..90289ded67 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -2908,16 +2908,17 @@ class ProgressDialog(Frame): """ return _windows_.ProgressDialog_Update(*args, **kwargs) - def UpdatePulse(*args, **kwargs): + def Pulse(*args, **kwargs): """ - UpdatePulse(self, String newmsg) --> (continue, skip) + Pulse(self, String newmsg) --> (continue, skip) Just like `Update` but switches the dialog to use a gauge in interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of progress. """ - return _windows_.ProgressDialog_UpdatePulse(*args, **kwargs) + return _windows_.ProgressDialog_Pulse(*args, **kwargs) + UpdatePulse = Pulse def Resume(*args, **kwargs): """ Resume(self) diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 6a2ed1f3eb..e69716229b 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -19653,7 +19653,7 @@ fail: } -SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_ProgressDialog_Pulse(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxProgressDialog *arg1 = (wxProgressDialog *) 0 ; wxString const &arg2_defvalue = wxPyEmptyString ; @@ -19672,10 +19672,10 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s }; arg3 = &temp3; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_UpdatePulse",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:ProgressDialog_Pulse",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxProgressDialog, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_UpdatePulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ProgressDialog_Pulse" "', expected argument " "1"" of type '" "wxProgressDialog *""'"); } arg1 = reinterpret_cast< wxProgressDialog * >(argp1); if (obj1) { @@ -19687,7 +19687,7 @@ SWIGINTERN PyObject *_wrap_ProgressDialog_UpdatePulse(PyObject *SWIGUNUSEDPARM(s } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->UpdatePulse((wxString const &)*arg2,arg3); + result = (bool)(arg1)->Pulse((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -31494,7 +31494,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MessageDialog_swiginit", MessageDialog_swiginit, METH_VARARGS, NULL}, { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ProgressDialog_UpdatePulse", (PyCFunction) _wrap_ProgressDialog_UpdatePulse, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ProgressDialog_Pulse", (PyCFunction) _wrap_ProgressDialog_Pulse, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ProgressDialog_Resume", (PyCFunction)_wrap_ProgressDialog_Resume, METH_O, NULL}, { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL}, { (char *)"ProgressDialog_swiginit", ProgressDialog_swiginit, METH_VARARGS, NULL}, -- 2.45.2