From 846c181ba2724c0333ddf15708f640a919078de2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 6 Oct 2006 20:08:33 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_core_ex.py | 2 +- wxPython/src/gtk/_core.py | 9 ++++--- wxPython/src/gtk/aui.py | 8 ++---- wxPython/src/gtk/aui_wrap.cpp | 50 ----------------------------------- wxPython/src/mac/_core.py | 9 ++++--- wxPython/src/msw/_core.py | 9 ++++--- 6 files changed, 21 insertions(+), 66 deletions(-) diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py index 2cd3fe4b6f..cf46d72114 100644 --- a/wxPython/src/_core_ex.py +++ b/wxPython/src/_core_ex.py @@ -248,7 +248,7 @@ class CallLater: class FutureCall(CallLater): - """A compatibility alias for `FutureCall`.""" + """A compatibility alias for `CallLater`.""" #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index bf3191065b..41d9a07c19 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -13482,7 +13482,7 @@ def CallAfter(callable, *args, **kw): method calls from non-GUI threads. Any extra positional or keyword args are passed on to the callable when it is called. - :see: `wx.FutureCall` + :see: `wx.CallLater` """ app = wx.GetApp() assert app is not None, 'No wx.App created yet' @@ -13501,7 +13501,7 @@ def CallAfter(callable, *args, **kw): #---------------------------------------------------------------------------- -class FutureCall: +class CallLater: """ A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any @@ -13512,7 +13512,7 @@ class FutureCall: then there is no need to hold a reference to this object. It will hold a reference to itself while the timer is running (the timer has a reference to self.Notify) but the cycle will be broken when - the timer completes, automatically cleaning up the wx.FutureCall + the timer completes, automatically cleaning up the wx.CallLater object. :see: `wx.CallAfter` @@ -13602,6 +13602,9 @@ class FutureCall: Result = property(GetResult) +class FutureCall(CallLater): + """A compatibility alias for `FutureCall`.""" + #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. # We allow only classes and functions, which will help reduce the size diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 7a73f5f894..9e20983b55 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -1273,6 +1273,7 @@ _aui.DockInfo_swigregister(DockInfo) class DockUIPart(object): """Proxy of C++ DockUIPart class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr typeCaption = _aui.DockUIPart_typeCaption typeGripper = _aui.DockUIPart_typeGripper @@ -1291,9 +1292,6 @@ class DockUIPart(object): cont_sizer = property(_aui.DockUIPart_cont_sizer_get, _aui.DockUIPart_cont_sizer_set) sizer_item = property(_aui.DockUIPart_sizer_item_get, _aui.DockUIPart_sizer_item_set) rect = property(_aui.DockUIPart_rect_get, _aui.DockUIPart_rect_set) - def __init__(self, *args, **kwargs): - """__init__(self) -> DockUIPart""" - _aui.DockUIPart_swiginit(self,_aui.new_DockUIPart(*args, **kwargs)) __swig_destroy__ = _aui.delete_DockUIPart __del__ = lambda self : None; _aui.DockUIPart_swigregister(DockUIPart) @@ -1301,11 +1299,9 @@ _aui.DockUIPart_swigregister(DockUIPart) class PaneButton(object): """Proxy of C++ PaneButton class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr button_id = property(_aui.PaneButton_button_id_get, _aui.PaneButton_button_id_set) - def __init__(self, *args, **kwargs): - """__init__(self) -> PaneButton""" - _aui.PaneButton_swiginit(self,_aui.new_PaneButton(*args, **kwargs)) __swig_destroy__ = _aui.delete_PaneButton __del__ = lambda self : None; _aui.PaneButton_swigregister(PaneButton) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 1e5814fbbe..fba429c83a 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -2859,9 +2859,7 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) } SWIGINTERN void delete_wxDockInfo(wxDockInfo *self){} -SWIGINTERN wxDockUIPart *new_wxDockUIPart(){} SWIGINTERN void delete_wxDockUIPart(wxDockUIPart *self){} -SWIGINTERN wxPaneButton *new_wxPaneButton(){} SWIGINTERN void delete_wxPaneButton(wxPaneButton *self){} SWIGINTERN int @@ -9650,24 +9648,6 @@ fail: } -SWIGINTERN PyObject *_wrap_new_DockUIPart(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxDockUIPart *result = 0 ; - - if (!SWIG_Python_UnpackTuple(args,"new_DockUIPart",0,0,0)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxDockUIPart *)new_wxDockUIPart(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxDockUIPart, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_delete_DockUIPart(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxDockUIPart *arg1 = (wxDockUIPart *) 0 ; @@ -9703,10 +9683,6 @@ SWIGINTERN PyObject *DockUIPart_swigregister(PyObject *SWIGUNUSEDPARM(self), PyO return SWIG_Py_Void(); } -SWIGINTERN PyObject *DockUIPart_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_PaneButton_button_id_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPaneButton *arg1 = (wxPaneButton *) 0 ; @@ -9760,24 +9736,6 @@ fail: } -SWIGINTERN PyObject *_wrap_new_PaneButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxPaneButton *result = 0 ; - - if (!SWIG_Python_UnpackTuple(args,"new_PaneButton",0,0,0)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPaneButton *)new_wxPaneButton(); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPaneButton, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_delete_PaneButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxPaneButton *arg1 = (wxPaneButton *) 0 ; @@ -9813,10 +9771,6 @@ SWIGINTERN PyObject *PaneButton_swigregister(PyObject *SWIGUNUSEDPARM(self), PyO return SWIG_Py_Void(); } -SWIGINTERN PyObject *PaneButton_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_delete_DockArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxDockArt *arg1 = (wxDockArt *) 0 ; @@ -13443,16 +13397,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"DockUIPart_sizer_item_get", (PyCFunction)_wrap_DockUIPart_sizer_item_get, METH_O, NULL}, { (char *)"DockUIPart_rect_set", _wrap_DockUIPart_rect_set, METH_VARARGS, NULL}, { (char *)"DockUIPart_rect_get", (PyCFunction)_wrap_DockUIPart_rect_get, METH_O, NULL}, - { (char *)"new_DockUIPart", (PyCFunction)_wrap_new_DockUIPart, METH_NOARGS, NULL}, { (char *)"delete_DockUIPart", (PyCFunction)_wrap_delete_DockUIPart, METH_O, NULL}, { (char *)"DockUIPart_swigregister", DockUIPart_swigregister, METH_VARARGS, NULL}, - { (char *)"DockUIPart_swiginit", DockUIPart_swiginit, METH_VARARGS, NULL}, { (char *)"PaneButton_button_id_set", _wrap_PaneButton_button_id_set, METH_VARARGS, NULL}, { (char *)"PaneButton_button_id_get", (PyCFunction)_wrap_PaneButton_button_id_get, METH_O, NULL}, - { (char *)"new_PaneButton", (PyCFunction)_wrap_new_PaneButton, METH_NOARGS, NULL}, { (char *)"delete_PaneButton", (PyCFunction)_wrap_delete_PaneButton, METH_O, NULL}, { (char *)"PaneButton_swigregister", PaneButton_swigregister, METH_VARARGS, NULL}, - { (char *)"PaneButton_swiginit", PaneButton_swiginit, METH_VARARGS, NULL}, { (char *)"delete_DockArt", (PyCFunction)_wrap_delete_DockArt, METH_O, NULL}, { (char *)"DockArt_GetMetric", (PyCFunction) _wrap_DockArt_GetMetric, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DockArt_SetMetric", (PyCFunction) _wrap_DockArt_SetMetric, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index bf3191065b..4f2f220f99 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -13482,7 +13482,7 @@ def CallAfter(callable, *args, **kw): method calls from non-GUI threads. Any extra positional or keyword args are passed on to the callable when it is called. - :see: `wx.FutureCall` + :see: `wx.CallLater` """ app = wx.GetApp() assert app is not None, 'No wx.App created yet' @@ -13501,7 +13501,7 @@ def CallAfter(callable, *args, **kw): #---------------------------------------------------------------------------- -class FutureCall: +class CallLater: """ A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any @@ -13512,7 +13512,7 @@ class FutureCall: then there is no need to hold a reference to this object. It will hold a reference to itself while the timer is running (the timer has a reference to self.Notify) but the cycle will be broken when - the timer completes, automatically cleaning up the wx.FutureCall + the timer completes, automatically cleaning up the wx.CallLater object. :see: `wx.CallAfter` @@ -13602,6 +13602,9 @@ class FutureCall: Result = property(GetResult) +class FutureCall(CallLater): + """A compatibility alias for `CallLater`.""" + #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. # We allow only classes and functions, which will help reduce the size diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 3129ffb2de..e378b94bb9 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -13486,7 +13486,7 @@ def CallAfter(callable, *args, **kw): method calls from non-GUI threads. Any extra positional or keyword args are passed on to the callable when it is called. - :see: `wx.FutureCall` + :see: `wx.CallLater` """ app = wx.GetApp() assert app is not None, 'No wx.App created yet' @@ -13505,7 +13505,7 @@ def CallAfter(callable, *args, **kw): #---------------------------------------------------------------------------- -class FutureCall: +class CallLater: """ A convenience class for `wx.Timer`, that calls the given callable object once after the given amount of milliseconds, passing any @@ -13516,7 +13516,7 @@ class FutureCall: then there is no need to hold a reference to this object. It will hold a reference to itself while the timer is running (the timer has a reference to self.Notify) but the cycle will be broken when - the timer completes, automatically cleaning up the wx.FutureCall + the timer completes, automatically cleaning up the wx.CallLater object. :see: `wx.CallAfter` @@ -13606,6 +13606,9 @@ class FutureCall: Result = property(GetResult) +class FutureCall(CallLater): + """A compatibility alias for `CallLater`.""" + #---------------------------------------------------------------------------- # Control which items in this module should be documented by epydoc. # We allow only classes and functions, which will help reduce the size -- 2.45.2