From 7f7aa1664c7e953c151d53fc2d86aff8b3459775 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 7 Feb 2006 04:42:55 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/mac/_controls.py | 299 ++++++-- wxPython/src/mac/_controls_wrap.cpp | 188 ++--- wxPython/src/mac/_gdi.py | 25 +- wxPython/src/mac/_gdi_wrap.cpp | 52 -- wxPython/src/mac/_misc.py | 207 ++++-- wxPython/src/mac/_misc_wrap.cpp | 300 ++++++-- wxPython/src/mac/_windows.py | 1065 ++++++++++++++++++++------- wxPython/src/mac/_windows_wrap.cpp | 667 +++++++++-------- wxPython/src/mac/grid.py | 365 ++++++--- wxPython/src/mac/grid_wrap.cpp | 364 ++++----- wxPython/src/mac/html.py | 50 +- wxPython/src/mac/html_wrap.cpp | 40 +- wxPython/src/mac/wizard.py | 281 +++++-- wxPython/src/mac/wizard_wrap.cpp | 261 ++++--- 14 files changed, 2726 insertions(+), 1438 deletions(-) diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 03a2d01a11..7eb6c35a5f 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -3016,13 +3016,13 @@ class BookCtrlBase(_core.Control): """IsVertical(self) -> bool""" return _controls_.BookCtrlBase_IsVertical(*args, **kwargs) - def SetShrinkMode(*args, **kwargs): - """SetShrinkMode(self, bool shrink)""" - return _controls_.BookCtrlBase_SetShrinkMode(*args, **kwargs) + def SetFitToCurrentPage(*args, **kwargs): + """SetFitToCurrentPage(self, bool fit)""" + return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs) - def GetShrinkMode(*args, **kwargs): - """GetShrinkMode(self) -> bool""" - return _controls_.BookCtrlBase_GetShrinkMode(*args, **kwargs) + def GetFitToCurrentPage(*args, **kwargs): + """GetFitToCurrentPage(self) -> bool""" + return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs) def DeletePage(*args, **kwargs): """DeletePage(self, size_t n) -> bool""" @@ -5989,89 +5989,250 @@ class PyControl(_core.Control): """DoEraseBackground(self, DC dc) -> bool""" return _controls_.PyControl_DoEraseBackground(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _controls_.PyControl_base_DoMoveWindow(*args, **kwargs) + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _controls_.PyControl_DoMoveWindow(*args, **kwargs) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _controls_.PyControl_base_DoSetSize(*args, **kwargs) + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _controls_.PyControl_DoSetSize(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _controls_.PyControl_base_DoSetClientSize(*args, **kwargs) + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _controls_.PyControl_DoSetClientSize(*args, **kwargs) - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _controls_.PyControl_base_DoSetVirtualSize(*args, **kwargs) + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _controls_.PyControl_DoSetVirtualSize(*args, **kwargs) - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _controls_.PyControl_base_DoGetSize(*args, **kwargs) + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _controls_.PyControl_DoGetSize(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _controls_.PyControl_base_DoGetClientSize(*args, **kwargs) + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _controls_.PyControl_DoGetClientSize(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _controls_.PyControl_base_DoGetPosition(*args, **kwargs) + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _controls_.PyControl_DoGetPosition(*args, **kwargs) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _controls_.PyControl_base_DoGetVirtualSize(*args, **kwargs) + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _controls_.PyControl_DoGetVirtualSize(*args, **kwargs) - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _controls_.PyControl_base_DoGetBestSize(*args, **kwargs) + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _controls_.PyControl_DoGetBestSize(*args, **kwargs) - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _controls_.PyControl_base_InitDialog(*args, **kwargs) + def InitDialog(*args, **kwargs): + """ + InitDialog(self) + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _controls_.PyControl_InitDialog(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool + + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _controls_.PyControl_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool + + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _controls_.PyControl_TransferDataFromWindow(*args, **kwargs) + + def Validate(*args, **kwargs): + """ + Validate(self) -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _controls_.PyControl_Validate(*args, **kwargs) + + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _controls_.PyControl_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool + + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _controls_.PyControl_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _controls_.PyControl_GetMaxSize(*args, **kwargs) + + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) + + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _controls_.PyControl_AddChild(*args, **kwargs) + + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) + + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _controls_.PyControl_RemoveChild(*args, **kwargs) + + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool + + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. + + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _controls_.PyControl_ShouldInheritColours(*args, **kwargs) + + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _controls_.PyControl_GetDefaultAttributes(*args, **kwargs) + + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _controls_.PyControl_OnInternalIdle(*args, **kwargs) + + def base_DoMoveWindow(*args, **kw): + return PyScrolledWindow.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyScrolledWindow.DoMoveWindow instead.") + + def base_DoSetSize(*args, **kw): + return PyScrolledWindow.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyScrolledWindow.DoSetSize instead.") - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _controls_.PyControl_base_TransferDataToWindow(*args, **kwargs) + def base_DoSetClientSize(*args, **kw): + return PyScrolledWindow.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyScrolledWindow.DoSetClientSize instead.") - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _controls_.PyControl_base_TransferDataFromWindow(*args, **kwargs) + def base_DoSetVirtualSize(*args, **kw): + return PyScrolledWindow.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyScrolledWindow.DoSetVirtualSize instead.") - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _controls_.PyControl_base_Validate(*args, **kwargs) + def base_DoGetSize(*args, **kw): + return PyScrolledWindow.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyScrolledWindow.DoGetSize instead.") - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _controls_.PyControl_base_AcceptsFocus(*args, **kwargs) + def base_DoGetClientSize(*args, **kw): + return PyScrolledWindow.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyScrolledWindow.DoGetClientSize instead.") - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _controls_.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs) + def base_DoGetPosition(*args, **kw): + return PyScrolledWindow.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyScrolledWindow.DoGetPosition instead.") - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _controls_.PyControl_base_GetMaxSize(*args, **kwargs) + def base_DoGetVirtualSize(*args, **kw): + return PyScrolledWindow.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyScrolledWindow.DoGetVirtualSize instead.") - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _controls_.PyControl_base_AddChild(*args, **kwargs) + def base_DoGetBestSize(*args, **kw): + return PyScrolledWindow.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyScrolledWindow.DoGetBestSize instead.") - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _controls_.PyControl_base_RemoveChild(*args, **kwargs) + def base_InitDialog(*args, **kw): + return PyScrolledWindow.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyScrolledWindow.InitDialog instead.") - def base_ShouldInheritColours(*args, **kwargs): - """base_ShouldInheritColours(self) -> bool""" - return _controls_.PyControl_base_ShouldInheritColours(*args, **kwargs) + def base_TransferDataToWindow(*args, **kw): + return PyScrolledWindow.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyScrolledWindow.TransferDataToWindow instead.") - def base_GetDefaultAttributes(*args, **kwargs): - """base_GetDefaultAttributes(self) -> VisualAttributes""" - return _controls_.PyControl_base_GetDefaultAttributes(*args, **kwargs) + def base_TransferDataFromWindow(*args, **kw): + return PyScrolledWindow.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyScrolledWindow.TransferDataFromWindow instead.") - def base_OnInternalIdle(*args, **kwargs): - """base_OnInternalIdle(self)""" - return _controls_.PyControl_base_OnInternalIdle(*args, **kwargs) + def base_Validate(*args, **kw): + return PyScrolledWindow.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyScrolledWindow.Validate instead.") + + def base_AcceptsFocus(*args, **kw): + return PyScrolledWindow.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyScrolledWindow.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyScrolledWindow.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyScrolledWindow.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyScrolledWindow.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyScrolledWindow.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyScrolledWindow.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyScrolledWindow.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyScrolledWindow.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyScrolledWindow.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyScrolledWindow.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyScrolledWindow.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyScrolledWindow.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyScrolledWindow.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyScrolledWindow.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyScrolledWindow.OnInternalIdle instead.") class PyControlPtr(PyControl): diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 09f6310eff..71c1929531 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -16776,17 +16776,17 @@ static PyObject *_wrap_BookCtrlBase_IsVertical(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; bool arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "shrink", NULL + (char *) "self",(char *) "fit", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetShrinkMode",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetFitToCurrentPage",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -16795,7 +16795,7 @@ static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetShrinkMode(arg2); + (arg1)->SetFitToCurrentPage(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -16807,7 +16807,7 @@ static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, Py } -static PyObject *_wrap_BookCtrlBase_GetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_BookCtrlBase_GetFitToCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; bool result; @@ -16816,12 +16816,12 @@ static PyObject *_wrap_BookCtrlBase_GetShrinkMode(PyObject *, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetShrinkMode",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetFitToCurrentPage",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxBookCtrlBase const *)arg1)->GetShrinkMode(); + result = (bool)((wxBookCtrlBase const *)arg1)->GetFitToCurrentPage(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18750,7 +18750,7 @@ static PyObject *_wrap_Treebook_InsertSubPage(PyObject *, PyObject *args, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->AddSubPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + result = (bool)(arg1)->InsertSubPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33553,7 +33553,7 @@ static PyObject *_wrap_PyControl_DoEraseBackground(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int arg2 ; @@ -33569,7 +33569,7 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, P (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyControl_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyControl_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -33590,7 +33590,7 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); + (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33602,7 +33602,7 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int arg2 ; @@ -33620,7 +33620,7 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *, PyObject *args, PyOb (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyControl_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyControl_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -33647,7 +33647,7 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *, PyObject *args, PyOb } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); + (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33659,7 +33659,7 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int arg2 ; @@ -33671,7 +33671,7 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *, PyObject *args (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -33684,7 +33684,7 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetClientSize(arg2,arg3); + (arg1)->DoSetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33696,7 +33696,7 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *, PyObject *args } -static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int arg2 ; @@ -33708,7 +33708,7 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *, PyObject *arg (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -33721,7 +33721,7 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetVirtualSize(arg2,arg3); + (arg1)->DoSetVirtualSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33733,7 +33733,7 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *, PyObject *arg } -static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int *arg2 = (int *) 0 ; @@ -33749,12 +33749,12 @@ static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *, PyObject *args, PyOb arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_DoGetSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyControl const *)arg1)->base_DoGetSize(arg2,arg3); + ((wxPyControl const *)arg1)->DoGetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33770,7 +33770,7 @@ static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int *arg2 = (int *) 0 ; @@ -33786,12 +33786,12 @@ static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *, PyObject *args arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetClientSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_DoGetClientSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyControl const *)arg1)->base_DoGetClientSize(arg2,arg3); + ((wxPyControl const *)arg1)->DoGetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33807,7 +33807,7 @@ static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *, PyObject *args } -static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; int *arg2 = (int *) 0 ; @@ -33823,12 +33823,12 @@ static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *, PyObject *args, arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_DoGetPosition",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyControl const *)arg1)->base_DoGetPosition(arg2,arg3); + ((wxPyControl const *)arg1)->DoGetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33844,7 +33844,7 @@ static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *, PyObject *args, } -static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxSize result; @@ -33853,12 +33853,12 @@ static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *, PyObject *arg (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetVirtualSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_DoGetVirtualSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyControl const *)arg1)->base_DoGetVirtualSize(); + result = ((wxPyControl const *)arg1)->DoGetVirtualSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33874,7 +33874,7 @@ static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *, PyObject *arg } -static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxSize result; @@ -33883,12 +33883,12 @@ static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetBestSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_DoGetBestSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyControl const *)arg1)->base_DoGetBestSize(); + result = ((wxPyControl const *)arg1)->DoGetBestSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33904,7 +33904,7 @@ static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyControl_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; PyObject * obj0 = 0 ; @@ -33912,12 +33912,12 @@ static PyObject *_wrap_PyControl_base_InitDialog(PyObject *, PyObject *args, PyO (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_InitDialog",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_InitDialog",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_InitDialog(); + (arg1)->InitDialog(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33929,7 +33929,7 @@ static PyObject *_wrap_PyControl_base_InitDialog(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -33938,12 +33938,12 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_TransferDataToWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_TransferDataToWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataToWindow(); + result = (bool)(arg1)->TransferDataToWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33957,7 +33957,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *, PyObject } -static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -33966,12 +33966,12 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_TransferDataFromWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataFromWindow(); + result = (bool)(arg1)->TransferDataFromWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -33985,7 +33985,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *, PyObjec } -static PyObject *_wrap_PyControl_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_Validate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -33994,12 +33994,12 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *, PyObject *args, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_Validate",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_Validate",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Validate(); + result = (bool)(arg1)->Validate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34013,7 +34013,7 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -34022,12 +34022,12 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_AcceptsFocus",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_AcceptsFocus",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyControl const *)arg1)->base_AcceptsFocus(); + result = (bool)((wxPyControl const *)arg1)->AcceptsFocus(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34041,7 +34041,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -34050,12 +34050,12 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyControl const *)arg1)->base_AcceptsFocusFromKeyboard(); + result = (bool)((wxPyControl const *)arg1)->AcceptsFocusFromKeyboard(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34069,7 +34069,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *, PyObj } -static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxSize result; @@ -34078,12 +34078,12 @@ static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *, PyObject *args, PyO (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_GetMaxSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyControl const *)arg1)->base_GetMaxSize(); + result = ((wxPyControl const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34099,7 +34099,7 @@ static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyControl_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -34109,14 +34109,14 @@ static PyObject *_wrap_PyControl_base_AddChild(PyObject *, PyObject *args, PyObj (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_base_AddChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_AddChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_AddChild(arg2); + (arg1)->AddChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34128,7 +34128,7 @@ static PyObject *_wrap_PyControl_base_AddChild(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -34138,14 +34138,14 @@ static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *, PyObject *args, Py (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControl_RemoveChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_RemoveChild(arg2); + (arg1)->RemoveChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34157,7 +34157,7 @@ static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; bool result; @@ -34166,12 +34166,12 @@ static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_ShouldInheritColours",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_ShouldInheritColours",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyControl const *)arg1)->base_ShouldInheritColours(); + result = (bool)((wxPyControl const *)arg1)->ShouldInheritColours(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34185,7 +34185,7 @@ static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject } -static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; wxVisualAttributes result; @@ -34194,12 +34194,12 @@ static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_GetDefaultAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetDefaultAttributes(); + result = (arg1)->GetDefaultAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -34215,7 +34215,7 @@ static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject } -static PyObject *_wrap_PyControl_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyControl_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyControl *arg1 = (wxPyControl *) 0 ; PyObject * obj0 = 0 ; @@ -34223,12 +34223,12 @@ static PyObject *_wrap_PyControl_base_OnInternalIdle(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_OnInternalIdle",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_OnInternalIdle",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyControl, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnInternalIdle(); + (arg1)->OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -36507,8 +36507,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_GetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_IsVertical", (PyCFunction) _wrap_BookCtrlBase_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlBase_SetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_SetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlBase_GetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_GetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_GetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction) _wrap_BookCtrlBase_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -36976,27 +36976,27 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyControl__setCallbackInfo", (PyCFunction) _wrap_PyControl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_SetBestSize", (PyCFunction) _wrap_PyControl_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_DoEraseBackground", (PyCFunction) _wrap_PyControl_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoMoveWindow", (PyCFunction) _wrap_PyControl_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoSetSize", (PyCFunction) _wrap_PyControl_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoSetClientSize", (PyCFunction) _wrap_PyControl_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoSetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoGetSize", (PyCFunction) _wrap_PyControl_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoGetClientSize", (PyCFunction) _wrap_PyControl_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoGetPosition", (PyCFunction) _wrap_PyControl_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoGetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_DoGetBestSize", (PyCFunction) _wrap_PyControl_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_InitDialog", (PyCFunction) _wrap_PyControl_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_TransferDataToWindow", (PyCFunction) _wrap_PyControl_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_TransferDataFromWindow", (PyCFunction) _wrap_PyControl_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_Validate", (PyCFunction) _wrap_PyControl_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_AcceptsFocus", (PyCFunction) _wrap_PyControl_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyControl_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_GetMaxSize", (PyCFunction) _wrap_PyControl_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_AddChild", (PyCFunction) _wrap_PyControl_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_RemoveChild", (PyCFunction) _wrap_PyControl_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_ShouldInheritColours", (PyCFunction) _wrap_PyControl_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyControl_base_OnInternalIdle", (PyCFunction) _wrap_PyControl_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoMoveWindow", (PyCFunction) _wrap_PyControl_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoSetSize", (PyCFunction) _wrap_PyControl_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoSetClientSize", (PyCFunction) _wrap_PyControl_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoSetVirtualSize", (PyCFunction) _wrap_PyControl_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoGetSize", (PyCFunction) _wrap_PyControl_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoGetClientSize", (PyCFunction) _wrap_PyControl_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoGetPosition", (PyCFunction) _wrap_PyControl_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoGetVirtualSize", (PyCFunction) _wrap_PyControl_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_DoGetBestSize", (PyCFunction) _wrap_PyControl_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_InitDialog", (PyCFunction) _wrap_PyControl_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_TransferDataToWindow", (PyCFunction) _wrap_PyControl_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_TransferDataFromWindow", (PyCFunction) _wrap_PyControl_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_Validate", (PyCFunction) _wrap_PyControl_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_AcceptsFocus", (PyCFunction) _wrap_PyControl_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyControl_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_GetMaxSize", (PyCFunction) _wrap_PyControl_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_AddChild", (PyCFunction) _wrap_PyControl_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_RemoveChild", (PyCFunction) _wrap_PyControl_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_ShouldInheritColours", (PyCFunction) _wrap_PyControl_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyControl_OnInternalIdle", (PyCFunction) _wrap_PyControl_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyControl_swigregister", PyControl_swigregister, METH_VARARGS, NULL}, { (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HelpEvent_GetPosition", (PyCFunction) _wrap_HelpEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 3061bfd021..3980f3994a 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -2682,27 +2682,10 @@ class DC(_core.Object): if self.thisown: destroy(self) except: pass - def BeginDrawing(*args, **kwargs): - """ - BeginDrawing(self) - - Allows for optimization of drawing code on platforms that need it. On - other platforms this is just an empty function and is harmless. To - take advantage of this postential optimization simply enclose each - group of calls to the drawing primitives within calls to - `BeginDrawing` and `EndDrawing`. - """ - return _gdi_.DC_BeginDrawing(*args, **kwargs) - - def EndDrawing(*args, **kwargs): - """ - EndDrawing(self) - - Ends the group of drawing primitives started with `BeginDrawing`, and - invokes whatever optimization is available for this DC type on the - current platform. - """ - return _gdi_.DC_EndDrawing(*args, **kwargs) + # These have been deprecated in wxWidgets. Since they never + # really did anything to begin with, just make them be NOPs. + def BeginDrawing(self): pass + def EndDrawing(self): pass def FloodFill(*args, **kwargs): """ diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 63bd40c466..a2112e69b3 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -12490,56 +12490,6 @@ static PyObject *_wrap_delete_DC(PyObject *, PyObject *args, PyObject *kwargs) { } -static PyObject *_wrap_DC_BeginDrawing(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_BeginDrawing",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->BeginDrawing(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_DC_EndDrawing(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DC_EndDrawing",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EndDrawing(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; @@ -22067,8 +22017,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS, NULL}, { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 988ad85f55..de9b5c03ea 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -134,6 +134,7 @@ SYS_SHOW_SOUNDS = _misc_.SYS_SHOW_SOUNDS SYS_SWAP_BUTTONS = _misc_.SYS_SWAP_BUTTONS SYS_CAN_DRAW_FRAME_DECORATIONS = _misc_.SYS_CAN_DRAW_FRAME_DECORATIONS SYS_CAN_ICONIZE_FRAME = _misc_.SYS_CAN_ICONIZE_FRAME +SYS_TABLET_PRESENT = _misc_.SYS_TABLET_PRESENT SYS_SCREEN_NONE = _misc_.SYS_SCREEN_NONE SYS_SCREEN_TINY = _misc_.SYS_SCREEN_TINY SYS_SCREEN_PDA = _misc_.SYS_SCREEN_PDA @@ -1252,6 +1253,10 @@ class Timer(_core.EvtHandler): """Stop(self)""" return _misc_.Timer_Stop(*args, **kwargs) + def Notify(*args, **kwargs): + """Notify(self)""" + return _misc_.Timer_Notify(*args, **kwargs) + def IsRunning(*args, **kwargs): """IsRunning(self) -> bool""" return _misc_.Timer_IsRunning(*args, **kwargs) @@ -1933,9 +1938,14 @@ class Process(_core.EvtHandler): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.Process__setCallbackInfo(*args, **kwargs) - def base_OnTerminate(*args, **kwargs): - """base_OnTerminate(self, int pid, int status)""" - return _misc_.Process_base_OnTerminate(*args, **kwargs) + def OnTerminate(*args, **kwargs): + """OnTerminate(self, int pid, int status)""" + return _misc_.Process_OnTerminate(*args, **kwargs) + + def base_OnTerminate(*args, **kw): + return Process.OnTerminate(*args, **kw) + base_OnTerminate = wx._deprecated(base_OnTerminate, + "Please use Process.OnTerminate instead.") def Redirect(*args, **kwargs): """Redirect(self)""" @@ -5482,9 +5492,14 @@ class DropSource(object): """DoDragDrop(self, int flags=Drag_CopyOnly) -> int""" return _misc_.DropSource_DoDragDrop(*args, **kwargs) - def base_GiveFeedback(*args, **kwargs): - """base_GiveFeedback(self, int effect) -> bool""" - return _misc_.DropSource_base_GiveFeedback(*args, **kwargs) + def GiveFeedback(*args, **kwargs): + """GiveFeedback(self, int effect) -> bool""" + return _misc_.DropSource_GiveFeedback(*args, **kwargs) + + def base_GiveFeedback(*args, **kw): + return DropSource.GiveFeedback(*args, **kw) + base_GiveFeedback = wx._deprecated(base_GiveFeedback, + "Please use DropSource.GiveFeedback instead.") class DropSourcePtr(DropSource): @@ -5536,21 +5551,41 @@ class DropTarget(object): """SetDataObject(self, DataObject dataObject)""" return _misc_.DropTarget_SetDataObject(*args, **kwargs) - def base_OnEnter(*args, **kwargs): - """base_OnEnter(self, int x, int y, int def) -> int""" - return _misc_.DropTarget_base_OnEnter(*args, **kwargs) + def OnEnter(*args, **kwargs): + """OnEnter(self, int x, int y, int def) -> int""" + return _misc_.DropTarget_OnEnter(*args, **kwargs) + + def OnDragOver(*args, **kwargs): + """OnDragOver(self, int x, int y, int def) -> int""" + return _misc_.DropTarget_OnDragOver(*args, **kwargs) + + def OnLeave(*args, **kwargs): + """OnLeave(self)""" + return _misc_.DropTarget_OnLeave(*args, **kwargs) - def base_OnDragOver(*args, **kwargs): - """base_OnDragOver(self, int x, int y, int def) -> int""" - return _misc_.DropTarget_base_OnDragOver(*args, **kwargs) + def OnDrop(*args, **kwargs): + """OnDrop(self, int x, int y) -> bool""" + return _misc_.DropTarget_OnDrop(*args, **kwargs) - def base_OnLeave(*args, **kwargs): - """base_OnLeave(self)""" - return _misc_.DropTarget_base_OnLeave(*args, **kwargs) + def base_OnEnter(*args, **kw): + return DropTarget.OnEnter(*args, **kw) + base_OnEnter = wx._deprecated(base_OnEnter, + "Please use DropTarget.OnEnter instead.") - def base_OnDrop(*args, **kwargs): - """base_OnDrop(self, int x, int y) -> bool""" - return _misc_.DropTarget_base_OnDrop(*args, **kwargs) + def base_OnDragOver(*args, **kw): + return DropTarget.OnDragOver(*args, **kw) + base_OnDragOver = wx._deprecated(base_OnDragOver, + "Please use DropTarget.OnDragOver instead.") + + def base_OnLeave(*args, **kw): + return DropTarget.OnLeave(*args, **kw) + base_OnLeave = wx._deprecated(base_OnLeave, + "Please use DropTarget.OnLeave instead.") + + def base_OnDrop(*args, **kw): + return DropTarget.OnDrop(*args, **kw) + base_OnDrop = wx._deprecated(base_OnDrop, + "Please use DropTarget.OnDrop instead.") def GetData(*args, **kwargs): """GetData(self) -> bool""" @@ -5589,25 +5624,59 @@ class TextDropTarget(DropTarget): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.TextDropTarget__setCallbackInfo(*args, **kwargs) - def base_OnEnter(*args, **kwargs): - """base_OnEnter(self, int x, int y, int def) -> int""" - return _misc_.TextDropTarget_base_OnEnter(*args, **kwargs) + def OnDropText(*args, **kwargs): + """OnDropText(self, int x, int y, String text) -> bool""" + return _misc_.TextDropTarget_OnDropText(*args, **kwargs) + + def OnEnter(*args, **kwargs): + """OnEnter(self, int x, int y, int def) -> int""" + return _misc_.TextDropTarget_OnEnter(*args, **kwargs) + + def OnDragOver(*args, **kwargs): + """OnDragOver(self, int x, int y, int def) -> int""" + return _misc_.TextDropTarget_OnDragOver(*args, **kwargs) - def base_OnDragOver(*args, **kwargs): - """base_OnDragOver(self, int x, int y, int def) -> int""" - return _misc_.TextDropTarget_base_OnDragOver(*args, **kwargs) + def OnLeave(*args, **kwargs): + """OnLeave(self)""" + return _misc_.TextDropTarget_OnLeave(*args, **kwargs) - def base_OnLeave(*args, **kwargs): - """base_OnLeave(self)""" - return _misc_.TextDropTarget_base_OnLeave(*args, **kwargs) + def OnDrop(*args, **kwargs): + """OnDrop(self, int x, int y) -> bool""" + return _misc_.TextDropTarget_OnDrop(*args, **kwargs) - def base_OnDrop(*args, **kwargs): - """base_OnDrop(self, int x, int y) -> bool""" - return _misc_.TextDropTarget_base_OnDrop(*args, **kwargs) + def OnData(*args, **kwargs): + """OnData(self, int x, int y, int def) -> int""" + return _misc_.TextDropTarget_OnData(*args, **kwargs) - def base_OnData(*args, **kwargs): - """base_OnData(self, int x, int y, int def) -> int""" - return _misc_.TextDropTarget_base_OnData(*args, **kwargs) + def base_OnDropText(*args, **kw): + return TextDropTarget.OnDropText(*args, **kw) + base_OnDropText = wx._deprecated(base_OnDropText, + "Please use TextDropTarget.OnDropText instead.") + + def base_OnEnter(*args, **kw): + return TextDropTarget.OnEnter(*args, **kw) + base_OnEnter = wx._deprecated(base_OnEnter, + "Please use TextDropTarget.OnEnter instead.") + + def base_OnDragOver(*args, **kw): + return TextDropTarget.OnDragOver(*args, **kw) + base_OnDragOver = wx._deprecated(base_OnDragOver, + "Please use TextDropTarget.OnDragOver instead.") + + def base_OnLeave(*args, **kw): + return TextDropTarget.OnLeave(*args, **kw) + base_OnLeave = wx._deprecated(base_OnLeave, + "Please use TextDropTarget.OnLeave instead.") + + def base_OnDrop(*args, **kw): + return TextDropTarget.OnDrop(*args, **kw) + base_OnDrop = wx._deprecated(base_OnDrop, + "Please use TextDropTarget.OnDrop instead.") + + def base_OnData(*args, **kw): + return TextDropTarget.OnData(*args, **kw) + base_OnData = wx._deprecated(base_OnData, + "Please use TextDropTarget.OnData instead.") class TextDropTargetPtr(TextDropTarget): @@ -5633,25 +5702,59 @@ class FileDropTarget(DropTarget): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.FileDropTarget__setCallbackInfo(*args, **kwargs) - def base_OnEnter(*args, **kwargs): - """base_OnEnter(self, int x, int y, int def) -> int""" - return _misc_.FileDropTarget_base_OnEnter(*args, **kwargs) - - def base_OnDragOver(*args, **kwargs): - """base_OnDragOver(self, int x, int y, int def) -> int""" - return _misc_.FileDropTarget_base_OnDragOver(*args, **kwargs) - - def base_OnLeave(*args, **kwargs): - """base_OnLeave(self)""" - return _misc_.FileDropTarget_base_OnLeave(*args, **kwargs) - - def base_OnDrop(*args, **kwargs): - """base_OnDrop(self, int x, int y) -> bool""" - return _misc_.FileDropTarget_base_OnDrop(*args, **kwargs) - - def base_OnData(*args, **kwargs): - """base_OnData(self, int x, int y, int def) -> int""" - return _misc_.FileDropTarget_base_OnData(*args, **kwargs) + def OnDropFiles(*args, **kwargs): + """OnDropFiles(self, int x, int y, wxArrayString filenames) -> bool""" + return _misc_.FileDropTarget_OnDropFiles(*args, **kwargs) + + def OnEnter(*args, **kwargs): + """OnEnter(self, int x, int y, int def) -> int""" + return _misc_.FileDropTarget_OnEnter(*args, **kwargs) + + def OnDragOver(*args, **kwargs): + """OnDragOver(self, int x, int y, int def) -> int""" + return _misc_.FileDropTarget_OnDragOver(*args, **kwargs) + + def OnLeave(*args, **kwargs): + """OnLeave(self)""" + return _misc_.FileDropTarget_OnLeave(*args, **kwargs) + + def OnDrop(*args, **kwargs): + """OnDrop(self, int x, int y) -> bool""" + return _misc_.FileDropTarget_OnDrop(*args, **kwargs) + + def OnData(*args, **kwargs): + """OnData(self, int x, int y, int def) -> int""" + return _misc_.FileDropTarget_OnData(*args, **kwargs) + + def base_OnDropFiles(*args, **kw): + return FileDropTarget.OnDropFiles(*args, **kw) + base_OnDropFiles = wx._deprecated(base_OnDropFiles, + "Please use FileDropTarget.OnDropFiles instead.") + + def base_OnEnter(*args, **kw): + return FileDropTarget.OnEnter(*args, **kw) + base_OnEnter = wx._deprecated(base_OnEnter, + "Please use FileDropTarget.OnEnter instead.") + + def base_OnDragOver(*args, **kw): + return FileDropTarget.OnDragOver(*args, **kw) + base_OnDragOver = wx._deprecated(base_OnDragOver, + "Please use FileDropTarget.OnDragOver instead.") + + def base_OnLeave(*args, **kw): + return FileDropTarget.OnLeave(*args, **kw) + base_OnLeave = wx._deprecated(base_OnLeave, + "Please use FileDropTarget.OnLeave instead.") + + def base_OnDrop(*args, **kw): + return FileDropTarget.OnDrop(*args, **kw) + base_OnDrop = wx._deprecated(base_OnDrop, + "Please use FileDropTarget.OnDrop instead.") + + def base_OnData(*args, **kw): + return FileDropTarget.OnData(*args, **kw) + base_OnData = wx._deprecated(base_OnData, + "Please use FileDropTarget.OnData instead.") class FileDropTargetPtr(FileDropTarget): diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 0e60ce386e..6893325f45 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -2016,7 +2016,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 +2027,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 +2244,10 @@ public: wxLog::DoLogString(szString, t); } + DEC_PYCALLBACK_VOID_(Flush); PYPRIVATE; }; +IMP_PYCALLBACK_VOID_(wxPyLog, wxLog, Flush); @@ -9282,6 +9269,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 +11894,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 +11906,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 +11919,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 +30106,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 +30117,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 +30126,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 +30286,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 +30301,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 +30318,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 +30330,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 +30345,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 +30362,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 +30374,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 +30382,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 +30399,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 +30412,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 +30425,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 +30584,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 +30655,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 +30672,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 +30684,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 +30699,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 +30716,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 +30728,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 +30736,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 +30753,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 +30766,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 +30779,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 +30793,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 +30808,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 +30825,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 +30897,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 +30978,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 +30995,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 +31007,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 +31022,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 +31039,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 +31051,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 +31059,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 +31076,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 +31089,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 +31102,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 +31116,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 +31131,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 +31148,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; @@ -32924,6 +33058,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 +33148,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 +33627,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 +35698,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))); } diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 2cbadcd07a..9c93834359 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -3518,89 +3518,250 @@ class PyWindow(_core.Window): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyWindow_DoEraseBackground(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _windows_.PyWindow_base_DoMoveWindow(*args, **kwargs) + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _windows_.PyWindow_DoMoveWindow(*args, **kwargs) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _windows_.PyWindow_base_DoSetSize(*args, **kwargs) + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _windows_.PyWindow_DoSetSize(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _windows_.PyWindow_base_DoSetClientSize(*args, **kwargs) + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _windows_.PyWindow_DoSetClientSize(*args, **kwargs) - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _windows_.PyWindow_base_DoSetVirtualSize(*args, **kwargs) + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _windows_.PyWindow_DoSetVirtualSize(*args, **kwargs) - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _windows_.PyWindow_base_DoGetSize(*args, **kwargs) + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _windows_.PyWindow_DoGetSize(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _windows_.PyWindow_base_DoGetClientSize(*args, **kwargs) + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _windows_.PyWindow_DoGetClientSize(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _windows_.PyWindow_base_DoGetPosition(*args, **kwargs) + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _windows_.PyWindow_DoGetPosition(*args, **kwargs) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _windows_.PyWindow_base_DoGetVirtualSize(*args, **kwargs) + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _windows_.PyWindow_DoGetVirtualSize(*args, **kwargs) - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _windows_.PyWindow_base_DoGetBestSize(*args, **kwargs) + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _windows_.PyWindow_DoGetBestSize(*args, **kwargs) - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _windows_.PyWindow_base_InitDialog(*args, **kwargs) + def InitDialog(*args, **kwargs): + """ + InitDialog(self) + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _windows_.PyWindow_InitDialog(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool + + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _windows_.PyWindow_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool + + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _windows_.PyWindow_TransferDataFromWindow(*args, **kwargs) + + def Validate(*args, **kwargs): + """ + Validate(self) -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _windows_.PyWindow_Validate(*args, **kwargs) + + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _windows_.PyWindow_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool + + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _windows_.PyWindow_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _windows_.PyWindow_GetMaxSize(*args, **kwargs) + + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) + + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _windows_.PyWindow_AddChild(*args, **kwargs) + + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) + + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _windows_.PyWindow_RemoveChild(*args, **kwargs) + + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool + + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. + + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _windows_.PyWindow_ShouldInheritColours(*args, **kwargs) + + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _windows_.PyWindow_GetDefaultAttributes(*args, **kwargs) + + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _windows_.PyWindow_OnInternalIdle(*args, **kwargs) + + def base_DoMoveWindow(*args, **kw): + return PyWindow.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyWindow.DoMoveWindow instead.") + + def base_DoSetSize(*args, **kw): + return PyWindow.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyWindow.DoSetSize instead.") - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _windows_.PyWindow_base_TransferDataToWindow(*args, **kwargs) + def base_DoSetClientSize(*args, **kw): + return PyWindow.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyWindow.DoSetClientSize instead.") - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _windows_.PyWindow_base_TransferDataFromWindow(*args, **kwargs) + def base_DoSetVirtualSize(*args, **kw): + return PyWindow.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyWindow.DoSetVirtualSize instead.") - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _windows_.PyWindow_base_Validate(*args, **kwargs) + def base_DoGetSize(*args, **kw): + return PyWindow.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyWindow.DoGetSize instead.") - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _windows_.PyWindow_base_AcceptsFocus(*args, **kwargs) + def base_DoGetClientSize(*args, **kw): + return PyWindow.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyWindow.DoGetClientSize instead.") - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _windows_.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs) + def base_DoGetPosition(*args, **kw): + return PyWindow.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyWindow.DoGetPosition instead.") - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _windows_.PyWindow_base_GetMaxSize(*args, **kwargs) + def base_DoGetVirtualSize(*args, **kw): + return PyWindow.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyWindow.DoGetVirtualSize instead.") - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _windows_.PyWindow_base_AddChild(*args, **kwargs) + def base_DoGetBestSize(*args, **kw): + return PyWindow.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyWindow.DoGetBestSize instead.") - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _windows_.PyWindow_base_RemoveChild(*args, **kwargs) + def base_InitDialog(*args, **kw): + return PyWindow.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyWindow.InitDialog instead.") - def base_ShouldInheritColours(*args, **kwargs): - """base_ShouldInheritColours(self) -> bool""" - return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs) + def base_TransferDataToWindow(*args, **kw): + return PyWindow.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyWindow.TransferDataToWindow instead.") - def base_GetDefaultAttributes(*args, **kwargs): - """base_GetDefaultAttributes(self) -> VisualAttributes""" - return _windows_.PyWindow_base_GetDefaultAttributes(*args, **kwargs) + def base_TransferDataFromWindow(*args, **kw): + return PyWindow.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyWindow.TransferDataFromWindow instead.") - def base_OnInternalIdle(*args, **kwargs): - """base_OnInternalIdle(self)""" - return _windows_.PyWindow_base_OnInternalIdle(*args, **kwargs) + def base_Validate(*args, **kw): + return PyWindow.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyWindow.Validate instead.") + + def base_AcceptsFocus(*args, **kw): + return PyWindow.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyWindow.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyWindow.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyWindow.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyWindow.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyWindow.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyWindow.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyWindow.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyWindow.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyWindow.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyWindow.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyWindow.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyWindow.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyWindow.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyWindow.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyWindow.OnInternalIdle instead.") class PyWindowPtr(PyWindow): @@ -3643,89 +3804,250 @@ class PyPanel(Panel): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyPanel_DoEraseBackground(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _windows_.PyPanel_base_DoMoveWindow(*args, **kwargs) + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _windows_.PyPanel_DoMoveWindow(*args, **kwargs) + + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _windows_.PyPanel_DoSetSize(*args, **kwargs) + + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _windows_.PyPanel_DoSetClientSize(*args, **kwargs) + + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _windows_.PyPanel_DoSetVirtualSize(*args, **kwargs) + + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _windows_.PyPanel_DoGetSize(*args, **kwargs) + + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _windows_.PyPanel_DoGetClientSize(*args, **kwargs) + + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _windows_.PyPanel_DoGetPosition(*args, **kwargs) + + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _windows_.PyPanel_DoGetVirtualSize(*args, **kwargs) + + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _windows_.PyPanel_DoGetBestSize(*args, **kwargs) + + def InitDialog(*args, **kwargs): + """ + InitDialog(self) + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _windows_.PyPanel_InitDialog(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool + + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _windows_.PyPanel_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool + + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _windows_.PyPanel_TransferDataFromWindow(*args, **kwargs) + + def Validate(*args, **kwargs): + """ + Validate(self) -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _windows_.PyPanel_Validate(*args, **kwargs) + + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _windows_.PyPanel_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool + + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _windows_.PyPanel_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _windows_.PyPanel_GetMaxSize(*args, **kwargs) + + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) + + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _windows_.PyPanel_AddChild(*args, **kwargs) + + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _windows_.PyPanel_base_DoSetSize(*args, **kwargs) + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _windows_.PyPanel_RemoveChild(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _windows_.PyPanel_base_DoSetClientSize(*args, **kwargs) + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _windows_.PyPanel_base_DoSetVirtualSize(*args, **kwargs) + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _windows_.PyPanel_base_DoGetSize(*args, **kwargs) + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _windows_.PyPanel_ShouldInheritColours(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _windows_.PyPanel_base_DoGetClientSize(*args, **kwargs) + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _windows_.PyPanel_GetDefaultAttributes(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _windows_.PyPanel_base_DoGetPosition(*args, **kwargs) + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _windows_.PyPanel_OnInternalIdle(*args, **kwargs) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _windows_.PyPanel_base_DoGetVirtualSize(*args, **kwargs) + def base_DoMoveWindow(*args, **kw): + return PyPanel.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyPanel.DoMoveWindow instead.") - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _windows_.PyPanel_base_DoGetBestSize(*args, **kwargs) + def base_DoSetSize(*args, **kw): + return PyPanel.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyPanel.DoSetSize instead.") - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _windows_.PyPanel_base_InitDialog(*args, **kwargs) + def base_DoSetClientSize(*args, **kw): + return PyPanel.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyPanel.DoSetClientSize instead.") - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _windows_.PyPanel_base_TransferDataToWindow(*args, **kwargs) + def base_DoSetVirtualSize(*args, **kw): + return PyPanel.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyPanel.DoSetVirtualSize instead.") - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _windows_.PyPanel_base_TransferDataFromWindow(*args, **kwargs) + def base_DoGetSize(*args, **kw): + return PyPanel.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyPanel.DoGetSize instead.") - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _windows_.PyPanel_base_Validate(*args, **kwargs) + def base_DoGetClientSize(*args, **kw): + return PyPanel.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyPanel.DoGetClientSize instead.") - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _windows_.PyPanel_base_AcceptsFocus(*args, **kwargs) + def base_DoGetPosition(*args, **kw): + return PyPanel.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyPanel.DoGetPosition instead.") - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _windows_.PyPanel_base_AcceptsFocusFromKeyboard(*args, **kwargs) + def base_DoGetVirtualSize(*args, **kw): + return PyPanel.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyPanel.DoGetVirtualSize instead.") - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _windows_.PyPanel_base_GetMaxSize(*args, **kwargs) + def base_DoGetBestSize(*args, **kw): + return PyPanel.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyPanel.DoGetBestSize instead.") - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _windows_.PyPanel_base_AddChild(*args, **kwargs) + def base_InitDialog(*args, **kw): + return PyPanel.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyPanel.InitDialog instead.") - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _windows_.PyPanel_base_RemoveChild(*args, **kwargs) + def base_TransferDataToWindow(*args, **kw): + return PyPanel.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyPanel.TransferDataToWindow instead.") - def base_ShouldInheritColours(*args, **kwargs): - """base_ShouldInheritColours(self) -> bool""" - return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs) + def base_TransferDataFromWindow(*args, **kw): + return PyPanel.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyPanel.TransferDataFromWindow instead.") - def base_GetDefaultAttributes(*args, **kwargs): - """base_GetDefaultAttributes(self) -> VisualAttributes""" - return _windows_.PyPanel_base_GetDefaultAttributes(*args, **kwargs) + def base_Validate(*args, **kw): + return PyPanel.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyPanel.Validate instead.") - def base_OnInternalIdle(*args, **kwargs): - """base_OnInternalIdle(self)""" - return _windows_.PyPanel_base_OnInternalIdle(*args, **kwargs) + def base_AcceptsFocus(*args, **kw): + return PyPanel.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyPanel.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyPanel.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyPanel.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyPanel.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyPanel.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyPanel.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyPanel.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyPanel.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyPanel.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyPanel.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyPanel.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyPanel.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyPanel.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyPanel.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyPanel.OnInternalIdle instead.") class PyPanelPtr(PyPanel): @@ -3768,89 +4090,250 @@ class PyScrolledWindow(ScrolledWindow): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _windows_.PyScrolledWindow_base_DoMoveWindow(*args, **kwargs) + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _windows_.PyScrolledWindow_DoMoveWindow(*args, **kwargs) + + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _windows_.PyScrolledWindow_DoSetSize(*args, **kwargs) + + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _windows_.PyScrolledWindow_DoSetClientSize(*args, **kwargs) + + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _windows_.PyScrolledWindow_DoSetVirtualSize(*args, **kwargs) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _windows_.PyScrolledWindow_base_DoSetSize(*args, **kwargs) + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _windows_.PyScrolledWindow_DoGetSize(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _windows_.PyScrolledWindow_base_DoSetClientSize(*args, **kwargs) + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _windows_.PyScrolledWindow_DoGetClientSize(*args, **kwargs) - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _windows_.PyScrolledWindow_base_DoSetVirtualSize(*args, **kwargs) + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _windows_.PyScrolledWindow_DoGetPosition(*args, **kwargs) - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _windows_.PyScrolledWindow_base_DoGetSize(*args, **kwargs) + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _windows_.PyScrolledWindow_DoGetVirtualSize(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _windows_.PyScrolledWindow_base_DoGetClientSize(*args, **kwargs) + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _windows_.PyScrolledWindow_DoGetBestSize(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _windows_.PyScrolledWindow_base_DoGetPosition(*args, **kwargs) + def InitDialog(*args, **kwargs): + """ + InitDialog(self) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _windows_.PyScrolledWindow_base_DoGetVirtualSize(*args, **kwargs) + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _windows_.PyScrolledWindow_InitDialog(*args, **kwargs) - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _windows_.PyScrolledWindow_base_DoGetBestSize(*args, **kwargs) + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool + + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _windows_.PyScrolledWindow_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool + + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _windows_.PyScrolledWindow_TransferDataFromWindow(*args, **kwargs) + + def Validate(*args, **kwargs): + """ + Validate(self) -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _windows_.PyScrolledWindow_Validate(*args, **kwargs) + + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _windows_.PyScrolledWindow_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool + + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _windows_.PyScrolledWindow_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _windows_.PyScrolledWindow_GetMaxSize(*args, **kwargs) + + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) + + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _windows_.PyScrolledWindow_AddChild(*args, **kwargs) + + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) + + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _windows_.PyScrolledWindow_RemoveChild(*args, **kwargs) + + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool + + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. + + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _windows_.PyScrolledWindow_ShouldInheritColours(*args, **kwargs) - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _windows_.PyScrolledWindow_base_InitDialog(*args, **kwargs) + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _windows_.PyScrolledWindow_GetDefaultAttributes(*args, **kwargs) - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _windows_.PyScrolledWindow_base_TransferDataToWindow(*args, **kwargs) + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _windows_.PyScrolledWindow_OnInternalIdle(*args, **kwargs) - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _windows_.PyScrolledWindow_base_TransferDataFromWindow(*args, **kwargs) + def base_DoMoveWindow(*args, **kw): + return PyScrolledWindow.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyScrolledWindow.DoMoveWindow instead.") - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _windows_.PyScrolledWindow_base_Validate(*args, **kwargs) + def base_DoSetSize(*args, **kw): + return PyScrolledWindow.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyScrolledWindow.DoSetSize instead.") - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _windows_.PyScrolledWindow_base_AcceptsFocus(*args, **kwargs) + def base_DoSetClientSize(*args, **kw): + return PyScrolledWindow.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyScrolledWindow.DoSetClientSize instead.") - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _windows_.PyScrolledWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs) + def base_DoSetVirtualSize(*args, **kw): + return PyScrolledWindow.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyScrolledWindow.DoSetVirtualSize instead.") - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _windows_.PyScrolledWindow_base_GetMaxSize(*args, **kwargs) + def base_DoGetSize(*args, **kw): + return PyScrolledWindow.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyScrolledWindow.DoGetSize instead.") - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _windows_.PyScrolledWindow_base_AddChild(*args, **kwargs) + def base_DoGetClientSize(*args, **kw): + return PyScrolledWindow.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyScrolledWindow.DoGetClientSize instead.") - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _windows_.PyScrolledWindow_base_RemoveChild(*args, **kwargs) + def base_DoGetPosition(*args, **kw): + return PyScrolledWindow.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyScrolledWindow.DoGetPosition instead.") - def base_ShouldInheritColours(*args, **kwargs): - """base_ShouldInheritColours(self) -> bool""" - return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs) + def base_DoGetVirtualSize(*args, **kw): + return PyScrolledWindow.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyScrolledWindow.DoGetVirtualSize instead.") - def base_GetDefaultAttributes(*args, **kwargs): - """base_GetDefaultAttributes(self) -> VisualAttributes""" - return _windows_.PyScrolledWindow_base_GetDefaultAttributes(*args, **kwargs) + def base_DoGetBestSize(*args, **kw): + return PyScrolledWindow.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyScrolledWindow.DoGetBestSize instead.") - def base_OnInternalIdle(*args, **kwargs): - """base_OnInternalIdle(self)""" - return _windows_.PyScrolledWindow_base_OnInternalIdle(*args, **kwargs) + def base_InitDialog(*args, **kw): + return PyScrolledWindow.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyScrolledWindow.InitDialog instead.") + + def base_TransferDataToWindow(*args, **kw): + return PyScrolledWindow.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyScrolledWindow.TransferDataToWindow instead.") + + def base_TransferDataFromWindow(*args, **kw): + return PyScrolledWindow.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyScrolledWindow.TransferDataFromWindow instead.") + + def base_Validate(*args, **kw): + return PyScrolledWindow.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyScrolledWindow.Validate instead.") + + def base_AcceptsFocus(*args, **kw): + return PyScrolledWindow.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyScrolledWindow.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyScrolledWindow.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyScrolledWindow.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyScrolledWindow.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyScrolledWindow.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyScrolledWindow.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyScrolledWindow.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyScrolledWindow.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyScrolledWindow.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyScrolledWindow.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyScrolledWindow.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyScrolledWindow.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyScrolledWindow.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyScrolledWindow.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyScrolledWindow.OnInternalIdle instead.") class PyScrolledWindowPtr(PyScrolledWindow): @@ -4520,33 +5003,63 @@ class Printout(_core.Object): """SetIsPreview(self, bool p)""" return _windows_.Printout_SetIsPreview(*args, **kwargs) - def base_OnBeginDocument(*args, **kwargs): - """base_OnBeginDocument(self, int startPage, int endPage) -> bool""" - return _windows_.Printout_base_OnBeginDocument(*args, **kwargs) + def OnBeginDocument(*args, **kwargs): + """OnBeginDocument(self, int startPage, int endPage) -> bool""" + return _windows_.Printout_OnBeginDocument(*args, **kwargs) + + def OnEndDocument(*args, **kwargs): + """OnEndDocument(self)""" + return _windows_.Printout_OnEndDocument(*args, **kwargs) + + def OnBeginPrinting(*args, **kwargs): + """OnBeginPrinting(self)""" + return _windows_.Printout_OnBeginPrinting(*args, **kwargs) - def base_OnEndDocument(*args, **kwargs): - """base_OnEndDocument(self)""" - return _windows_.Printout_base_OnEndDocument(*args, **kwargs) + def OnEndPrinting(*args, **kwargs): + """OnEndPrinting(self)""" + return _windows_.Printout_OnEndPrinting(*args, **kwargs) - def base_OnBeginPrinting(*args, **kwargs): - """base_OnBeginPrinting(self)""" - return _windows_.Printout_base_OnBeginPrinting(*args, **kwargs) + def OnPreparePrinting(*args, **kwargs): + """OnPreparePrinting(self)""" + return _windows_.Printout_OnPreparePrinting(*args, **kwargs) - def base_OnEndPrinting(*args, **kwargs): - """base_OnEndPrinting(self)""" - return _windows_.Printout_base_OnEndPrinting(*args, **kwargs) + def HasPage(*args, **kwargs): + """HasPage(self, int page) -> bool""" + return _windows_.Printout_HasPage(*args, **kwargs) - def base_OnPreparePrinting(*args, **kwargs): - """base_OnPreparePrinting(self)""" - return _windows_.Printout_base_OnPreparePrinting(*args, **kwargs) + def GetPageInfo(*args, **kwargs): + """GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)""" + return _windows_.Printout_GetPageInfo(*args, **kwargs) - def base_HasPage(*args, **kwargs): - """base_HasPage(self, int page) -> bool""" - return _windows_.Printout_base_HasPage(*args, **kwargs) + def base_OnBeginDocument(*args, **kw): + return Printout.OnBeginDocument(*args, **kw) + base_OnBeginDocument = wx._deprecated(base_OnBeginDocument, + "Please use Printout.OnBeginDocument instead.") - def base_GetPageInfo(*args, **kwargs): - """base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)""" - return _windows_.Printout_base_GetPageInfo(*args, **kwargs) + def base_OnEndDocument(*args, **kw): + return Printout.OnEndDocument(*args, **kw) + base_OnEndDocument = wx._deprecated(base_OnEndDocument, + "Please use Printout.OnEndDocument instead.") + + def base_OnBeginPrinting(*args, **kw): + return Printout.OnBeginPrinting(*args, **kw) + base_OnBeginPrinting = wx._deprecated(base_OnBeginPrinting, + "Please use Printout.OnBeginPrinting instead.") + + def base_OnEndPrinting(*args, **kw): + return Printout.OnEndPrinting(*args, **kw) + base_OnEndPrinting = wx._deprecated(base_OnEndPrinting, + "Please use Printout.OnEndPrinting instead.") + + def base_OnPreparePrinting(*args, **kw): + return Printout.OnPreparePrinting(*args, **kw) + base_OnPreparePrinting = wx._deprecated(base_OnPreparePrinting, + "Please use Printout.OnPreparePrinting instead.") + + def base_GetPageInfo(*args, **kw): + return Printout.GetPageInfo(*args, **kw) + base_GetPageInfo = wx._deprecated(base_GetPageInfo, + "Please use Printout.GetPageInfo instead.") class PrintoutPtr(Printout): @@ -4821,33 +5334,68 @@ class PyPrintPreview(PrintPreview): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyPrintPreview__setCallbackInfo(*args, **kwargs) - def base_SetCurrentPage(*args, **kwargs): - """base_SetCurrentPage(self, int pageNum) -> bool""" - return _windows_.PyPrintPreview_base_SetCurrentPage(*args, **kwargs) + def SetCurrentPage(*args, **kwargs): + """SetCurrentPage(self, int pageNum) -> bool""" + return _windows_.PyPrintPreview_SetCurrentPage(*args, **kwargs) + + def PaintPage(*args, **kwargs): + """PaintPage(self, PreviewCanvas canvas, DC dc) -> bool""" + return _windows_.PyPrintPreview_PaintPage(*args, **kwargs) + + def DrawBlankPage(*args, **kwargs): + """DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool""" + return _windows_.PyPrintPreview_DrawBlankPage(*args, **kwargs) + + def RenderPage(*args, **kwargs): + """RenderPage(self, int pageNum) -> bool""" + return _windows_.PyPrintPreview_RenderPage(*args, **kwargs) + + def SetZoom(*args, **kwargs): + """SetZoom(self, int percent)""" + return _windows_.PyPrintPreview_SetZoom(*args, **kwargs) - def base_PaintPage(*args, **kwargs): - """base_PaintPage(self, PreviewCanvas canvas, DC dc) -> bool""" - return _windows_.PyPrintPreview_base_PaintPage(*args, **kwargs) + def Print(*args, **kwargs): + """Print(self, bool interactive) -> bool""" + return _windows_.PyPrintPreview_Print(*args, **kwargs) - def base_DrawBlankPage(*args, **kwargs): - """base_DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool""" - return _windows_.PyPrintPreview_base_DrawBlankPage(*args, **kwargs) + def DetermineScaling(*args, **kwargs): + """DetermineScaling(self)""" + return _windows_.PyPrintPreview_DetermineScaling(*args, **kwargs) - def base_RenderPage(*args, **kwargs): - """base_RenderPage(self, int pageNum) -> bool""" - return _windows_.PyPrintPreview_base_RenderPage(*args, **kwargs) + def base_SetCurrentPage(*args, **kw): + return PyPrintPreview.SetCurrentPage(*args, **kw) + base_SetCurrentPage = wx._deprecated(base_SetCurrentPage, + "Please use PyPrintPreview.SetCurrentPage instead.") - def base_SetZoom(*args, **kwargs): - """base_SetZoom(self, int percent)""" - return _windows_.PyPrintPreview_base_SetZoom(*args, **kwargs) + def base_PaintPage(*args, **kw): + return PyPrintPreview.PaintPage(*args, **kw) + base_PaintPage = wx._deprecated(base_PaintPage, + "Please use PyPrintPreview.PaintPage instead.") - def base_Print(*args, **kwargs): - """base_Print(self, bool interactive) -> bool""" - return _windows_.PyPrintPreview_base_Print(*args, **kwargs) + def base_DrawBlankPage(*args, **kw): + return PyPrintPreview.DrawBlankPage(*args, **kw) + base_DrawBlankPage = wx._deprecated(base_DrawBlankPage, + "Please use PyPrintPreview.DrawBlankPage instead.") - def base_DetermineScaling(*args, **kwargs): - """base_DetermineScaling(self)""" - return _windows_.PyPrintPreview_base_DetermineScaling(*args, **kwargs) + def base_RenderPage(*args, **kw): + return PyPrintPreview.RenderPage(*args, **kw) + base_RenderPage = wx._deprecated(base_RenderPage, + "Please use PyPrintPreview.RenderPage instead.") + + def base_SetZoom(*args, **kw): + return PyPrintPreview.SetZoom(*args, **kw) + base_SetZoom = wx._deprecated(base_SetZoom, + "Please use PyPrintPreview.SetZoom instead.") + + def base_Print(*args, **kw): + return PyPrintPreview.Print(*args, **kw) + base_Print = wx._deprecated(base_Print, + "Please use PyPrintPreview.Print instead.") + + def base_DetermineScaling(*args, **kw): + return PyPrintPreview.DetermineScaling(*args, **kw) + base_DetermineScaling = wx._deprecated(base_DetermineScaling, + "Please use PyPrintPreview.DetermineScaling instead.") class PyPrintPreviewPtr(PyPrintPreview): @@ -4885,17 +5433,32 @@ class PyPreviewFrame(PreviewFrame): """SetControlBar(self, PreviewControlBar bar)""" return _windows_.PyPreviewFrame_SetControlBar(*args, **kwargs) - def base_Initialize(*args, **kwargs): - """base_Initialize(self)""" - return _windows_.PyPreviewFrame_base_Initialize(*args, **kwargs) + def Initialize(*args, **kwargs): + """Initialize(self)""" + return _windows_.PyPreviewFrame_Initialize(*args, **kwargs) + + def CreateCanvas(*args, **kwargs): + """CreateCanvas(self)""" + return _windows_.PyPreviewFrame_CreateCanvas(*args, **kwargs) + + def CreateControlBar(*args, **kwargs): + """CreateControlBar(self)""" + return _windows_.PyPreviewFrame_CreateControlBar(*args, **kwargs) - def base_CreateCanvas(*args, **kwargs): - """base_CreateCanvas(self)""" - return _windows_.PyPreviewFrame_base_CreateCanvas(*args, **kwargs) + def base_Initialize(*args, **kw): + return PyPreviewFrame.Initialize(*args, **kw) + base_Initialize = wx._deprecated(base_Initialize, + "Please use PyPreviewFrame.Initialize instead.") - def base_CreateControlBar(*args, **kwargs): - """base_CreateControlBar(self)""" - return _windows_.PyPreviewFrame_base_CreateControlBar(*args, **kwargs) + def base_CreateCanvas(*args, **kw): + return PyPreviewFrame.CreateCanvas(*args, **kw) + base_CreateCanvas = wx._deprecated(base_CreateCanvas, + "Please use PyPreviewFrame.CreateCanvas instead.") + + def base_CreateControlBar(*args, **kw): + return PyPreviewFrame.CreateControlBar(*args, **kw) + base_CreateControlBar = wx._deprecated(base_CreateControlBar, + "Please use PyPreviewFrame.CreateControlBar instead.") class PyPreviewFramePtr(PyPreviewFrame): @@ -4929,13 +5492,23 @@ class PyPreviewControlBar(PreviewControlBar): """SetPrintPreview(self, PrintPreview preview)""" return _windows_.PyPreviewControlBar_SetPrintPreview(*args, **kwargs) - def base_CreateButtons(*args, **kwargs): - """base_CreateButtons(self)""" - return _windows_.PyPreviewControlBar_base_CreateButtons(*args, **kwargs) + def CreateButtons(*args, **kwargs): + """CreateButtons(self)""" + return _windows_.PyPreviewControlBar_CreateButtons(*args, **kwargs) + + def SetZoomControl(*args, **kwargs): + """SetZoomControl(self, int zoom)""" + return _windows_.PyPreviewControlBar_SetZoomControl(*args, **kwargs) + + def base_CreateButtons(*args, **kw): + return PreviewControlBar.CreateButtons(*args, **kw) + base_CreateButtons = wx._deprecated(base_CreateButtons, + "Please use PreviewControlBar.CreateButtons instead.") - def base_SetZoomControl(*args, **kwargs): - """base_SetZoomControl(self, int zoom)""" - return _windows_.PyPreviewControlBar_base_SetZoomControl(*args, **kwargs) + def base_SetZoomControl(*args, **kw): + return PreviewControlBar.SetZoomControl(*args, **kw) + base_SetZoomControl = wx._deprecated(base_SetZoomControl, + "Please use PreviewControlBar.SetZoomControl instead.") class PyPreviewControlBarPtr(PyPreviewControlBar): diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 0ba87c6b23..50a6c97e68 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -2598,9 +2598,6 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); } -void wxPyPrintout::base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { - wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); -} IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument); @@ -2616,8 +2613,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); #define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME) \ - bool CBNAME(wxPreviewCanvas* a, wxDC& b); \ - bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b) + bool CBNAME(wxPreviewCanvas* a, wxDC& b) #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME) \ @@ -2636,10 +2632,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ - } \ - bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) { \ - return PCLASS::CBNAME(a, b); \ - } + } @@ -18131,7 +18124,7 @@ static PyObject *_wrap_PyWindow_DoEraseBackground(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int arg2 ; @@ -18147,7 +18140,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18168,7 +18161,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); + (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18180,7 +18173,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int arg2 ; @@ -18198,7 +18191,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18225,7 +18218,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); + (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18237,7 +18230,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int arg2 ; @@ -18249,7 +18242,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18262,7 +18255,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetClientSize(arg2,arg3); + (arg1)->DoSetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18274,7 +18267,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int arg2 ; @@ -18286,7 +18279,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18299,7 +18292,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetVirtualSize(arg2,arg3); + (arg1)->DoSetVirtualSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18311,7 +18304,7 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args } -static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -18327,12 +18320,12 @@ static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObj arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWindow const *)arg1)->base_DoGetSize(arg2,arg3); + ((wxPyWindow const *)arg1)->DoGetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18348,7 +18341,7 @@ static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -18364,12 +18357,12 @@ static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args, arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetClientSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWindow const *)arg1)->base_DoGetClientSize(arg2,arg3); + ((wxPyWindow const *)arg1)->DoGetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18385,7 +18378,7 @@ static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -18401,12 +18394,12 @@ static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, P arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetPosition",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWindow const *)arg1)->base_DoGetPosition(arg2,arg3); + ((wxPyWindow const *)arg1)->DoGetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18422,7 +18415,7 @@ static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxSize result; @@ -18431,12 +18424,12 @@ static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetVirtualSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetVirtualSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWindow const *)arg1)->base_DoGetVirtualSize(); + result = ((wxPyWindow const *)arg1)->DoGetVirtualSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18452,7 +18445,7 @@ static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args } -static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxSize result; @@ -18461,12 +18454,12 @@ static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetBestSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_DoGetBestSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWindow const *)arg1)->base_DoGetBestSize(); + result = ((wxPyWindow const *)arg1)->DoGetBestSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18482,7 +18475,7 @@ static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; PyObject * obj0 = 0 ; @@ -18490,12 +18483,12 @@ static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyOb (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_InitDialog",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_InitDialog",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_InitDialog(); + (arg1)->InitDialog(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18507,7 +18500,7 @@ static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18516,12 +18509,12 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_TransferDataToWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_TransferDataToWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataToWindow(); + result = (bool)(arg1)->TransferDataToWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18535,7 +18528,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject * } -static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18544,12 +18537,12 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_TransferDataFromWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataFromWindow(); + result = (bool)(arg1)->TransferDataFromWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18563,7 +18556,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject } -static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_Validate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18572,12 +18565,12 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_Validate",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_Validate",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Validate(); + result = (bool)(arg1)->Validate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18591,7 +18584,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18600,12 +18593,12 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_AcceptsFocus",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_AcceptsFocus",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyWindow const *)arg1)->base_AcceptsFocus(); + result = (bool)((wxPyWindow const *)arg1)->AcceptsFocus(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18619,7 +18612,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18628,12 +18621,12 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyWindow const *)arg1)->base_AcceptsFocusFromKeyboard(); + result = (bool)((wxPyWindow const *)arg1)->AcceptsFocusFromKeyboard(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18647,7 +18640,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObje } -static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxSize result; @@ -18656,12 +18649,12 @@ static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyOb (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_GetMaxSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWindow const *)arg1)->base_GetMaxSize(); + result = ((wxPyWindow const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18677,7 +18670,7 @@ static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -18687,14 +18680,14 @@ static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObje (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_base_AddChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_AddChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_AddChild(arg2); + (arg1)->AddChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18706,7 +18699,7 @@ static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -18716,14 +18709,14 @@ static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyO (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWindow_RemoveChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_RemoveChild(arg2); + (arg1)->RemoveChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18735,7 +18728,7 @@ static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; bool result; @@ -18744,12 +18737,12 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_ShouldInheritColours",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_ShouldInheritColours",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyWindow const *)arg1)->base_ShouldInheritColours(); + result = (bool)((wxPyWindow const *)arg1)->ShouldInheritColours(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18763,7 +18756,7 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject * } -static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; wxVisualAttributes result; @@ -18772,12 +18765,12 @@ static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_GetDefaultAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetDefaultAttributes(); + result = (arg1)->GetDefaultAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18793,7 +18786,7 @@ static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject * } -static PyObject *_wrap_PyWindow_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWindow_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWindow *arg1 = (wxPyWindow *) 0 ; PyObject * obj0 = 0 ; @@ -18801,12 +18794,12 @@ static PyObject *_wrap_PyWindow_base_OnInternalIdle(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_OnInternalIdle",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_OnInternalIdle",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnInternalIdle(); + (arg1)->OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19025,7 +19018,7 @@ static PyObject *_wrap_PyPanel_DoEraseBackground(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int arg2 ; @@ -19041,7 +19034,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -19062,7 +19055,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); + (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19074,7 +19067,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int arg2 ; @@ -19092,7 +19085,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObje (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -19119,7 +19112,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); + (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19131,7 +19124,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int arg2 ; @@ -19143,7 +19136,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -19156,7 +19149,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetClientSize(arg2,arg3); + (arg1)->DoSetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19168,7 +19161,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int arg2 ; @@ -19180,7 +19173,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -19193,7 +19186,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetVirtualSize(arg2,arg3); + (arg1)->DoSetVirtualSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19205,7 +19198,7 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int *arg2 = (int *) 0 ; @@ -19221,12 +19214,12 @@ static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObje arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyPanel const *)arg1)->base_DoGetSize(arg2,arg3); + ((wxPyPanel const *)arg1)->DoGetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19242,7 +19235,7 @@ static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int *arg2 = (int *) 0 ; @@ -19258,12 +19251,12 @@ static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args, arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetClientSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetClientSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyPanel const *)arg1)->base_DoGetClientSize(arg2,arg3); + ((wxPyPanel const *)arg1)->DoGetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19279,7 +19272,7 @@ static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; int *arg2 = (int *) 0 ; @@ -19295,12 +19288,12 @@ static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, Py arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetPosition",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyPanel const *)arg1)->base_DoGetPosition(arg2,arg3); + ((wxPyPanel const *)arg1)->DoGetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19316,7 +19309,7 @@ static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxSize result; @@ -19325,12 +19318,12 @@ static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetVirtualSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetVirtualSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyPanel const *)arg1)->base_DoGetVirtualSize(); + result = ((wxPyPanel const *)arg1)->DoGetVirtualSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19346,7 +19339,7 @@ static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxSize result; @@ -19355,12 +19348,12 @@ static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetBestSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_DoGetBestSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyPanel const *)arg1)->base_DoGetBestSize(); + result = ((wxPyPanel const *)arg1)->DoGetBestSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19376,7 +19369,7 @@ static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; PyObject * obj0 = 0 ; @@ -19384,12 +19377,12 @@ static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_InitDialog",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_InitDialog",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_InitDialog(); + (arg1)->InitDialog(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19401,7 +19394,7 @@ static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19410,12 +19403,12 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *a (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_TransferDataToWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_TransferDataToWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataToWindow(); + result = (bool)(arg1)->TransferDataToWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19429,7 +19422,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *a } -static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19438,12 +19431,12 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_TransferDataFromWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataFromWindow(); + result = (bool)(arg1)->TransferDataFromWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19457,7 +19450,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject } -static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_Validate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19466,12 +19459,12 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_Validate",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_Validate",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Validate(); + result = (bool)(arg1)->Validate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19485,7 +19478,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19494,12 +19487,12 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyO (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_AcceptsFocus",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_AcceptsFocus",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyPanel const *)arg1)->base_AcceptsFocus(); + result = (bool)((wxPyPanel const *)arg1)->AcceptsFocus(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19513,7 +19506,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19522,12 +19515,12 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyPanel const *)arg1)->base_AcceptsFocusFromKeyboard(); + result = (bool)((wxPyPanel const *)arg1)->AcceptsFocusFromKeyboard(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19541,7 +19534,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObjec } -static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxSize result; @@ -19550,12 +19543,12 @@ static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObj (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_GetMaxSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyPanel const *)arg1)->base_GetMaxSize(); + result = ((wxPyPanel const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19571,7 +19564,7 @@ static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -19581,14 +19574,14 @@ static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObjec (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_base_AddChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_AddChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_AddChild(arg2); + (arg1)->AddChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19600,7 +19593,7 @@ static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -19610,14 +19603,14 @@ static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyOb (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPanel_RemoveChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_RemoveChild(arg2); + (arg1)->RemoveChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19629,7 +19622,7 @@ static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; bool result; @@ -19638,12 +19631,12 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *a (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_ShouldInheritColours",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_ShouldInheritColours",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyPanel const *)arg1)->base_ShouldInheritColours(); + result = (bool)((wxPyPanel const *)arg1)->ShouldInheritColours(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19657,7 +19650,7 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *a } -static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; wxVisualAttributes result; @@ -19666,12 +19659,12 @@ static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *a (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_GetDefaultAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetDefaultAttributes(); + result = (arg1)->GetDefaultAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19687,7 +19680,7 @@ static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *a } -static PyObject *_wrap_PyPanel_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPanel_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPanel *arg1 = (wxPyPanel *) 0 ; PyObject * obj0 = 0 ; @@ -19695,12 +19688,12 @@ static PyObject *_wrap_PyPanel_base_OnInternalIdle(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_OnInternalIdle",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_OnInternalIdle",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPanel, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnInternalIdle(); + (arg1)->OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19919,7 +19912,7 @@ static PyObject *_wrap_PyScrolledWindow_DoEraseBackground(PyObject *, PyObject * } -static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int arg2 ; @@ -19935,7 +19928,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject * (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -19956,7 +19949,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); + (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19968,7 +19961,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject * } -static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int arg2 ; @@ -19986,7 +19979,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -20013,7 +20006,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); + (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20025,7 +20018,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *arg } -static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int arg2 ; @@ -20037,7 +20030,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -20050,7 +20043,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetClientSize(arg2,arg3); + (arg1)->DoSetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20062,7 +20055,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObjec } -static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int arg2 ; @@ -20074,7 +20067,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -20087,7 +20080,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetVirtualSize(arg2,arg3); + (arg1)->DoSetVirtualSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20099,7 +20092,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObje } -static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -20115,12 +20108,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *arg arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyScrolledWindow const *)arg1)->base_DoGetSize(arg2,arg3); + ((wxPyScrolledWindow const *)arg1)->DoGetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20136,7 +20129,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *arg } -static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -20152,12 +20145,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObjec arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetClientSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyScrolledWindow const *)arg1)->base_DoGetClientSize(arg2,arg3); + ((wxPyScrolledWindow const *)arg1)->DoGetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20173,7 +20166,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObjec } -static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; int *arg2 = (int *) 0 ; @@ -20189,12 +20182,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetPosition",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyScrolledWindow const *)arg1)->base_DoGetPosition(arg2,arg3); + ((wxPyScrolledWindow const *)arg1)->DoGetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20210,7 +20203,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject } -static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxSize result; @@ -20219,12 +20212,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetVirtualSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetVirtualSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyScrolledWindow const *)arg1)->base_DoGetVirtualSize(); + result = ((wxPyScrolledWindow const *)arg1)->DoGetVirtualSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20240,7 +20233,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObje } -static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxSize result; @@ -20249,12 +20242,12 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetBestSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_DoGetBestSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyScrolledWindow const *)arg1)->base_DoGetBestSize(); + result = ((wxPyScrolledWindow const *)arg1)->DoGetBestSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20270,7 +20263,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject } -static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; PyObject * obj0 = 0 ; @@ -20278,12 +20271,12 @@ static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *ar (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_InitDialog",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_InitDialog",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_InitDialog(); + (arg1)->InitDialog(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20295,7 +20288,7 @@ static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *ar } -static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20304,12 +20297,12 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_TransferDataToWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_TransferDataToWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataToWindow(); + result = (bool)(arg1)->TransferDataToWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20323,7 +20316,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, Py } -static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20332,12 +20325,12 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_TransferDataFromWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataFromWindow(); + result = (bool)(arg1)->TransferDataFromWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20351,7 +20344,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *, } -static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_Validate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20360,12 +20353,12 @@ static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_Validate",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_Validate",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Validate(); + result = (bool)(arg1)->Validate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20379,7 +20372,7 @@ static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args } -static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20388,12 +20381,12 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_AcceptsFocus",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_AcceptsFocus",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyScrolledWindow const *)arg1)->base_AcceptsFocus(); + result = (bool)((wxPyScrolledWindow const *)arg1)->AcceptsFocus(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20407,7 +20400,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject * } -static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20416,12 +20409,12 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyScrolledWindow const *)arg1)->base_AcceptsFocusFromKeyboard(); + result = (bool)((wxPyScrolledWindow const *)arg1)->AcceptsFocusFromKeyboard(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20435,7 +20428,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject * } -static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxSize result; @@ -20444,12 +20437,12 @@ static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *ar (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_GetMaxSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyScrolledWindow const *)arg1)->base_GetMaxSize(); + result = ((wxPyScrolledWindow const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20465,7 +20458,7 @@ static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *ar } -static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -20475,14 +20468,14 @@ static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_base_AddChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_AddChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_AddChild(arg2); + (arg1)->AddChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20494,7 +20487,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args } -static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -20504,14 +20497,14 @@ static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *a (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyScrolledWindow_RemoveChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_RemoveChild(arg2); + (arg1)->RemoveChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20523,7 +20516,7 @@ static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *a } -static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; bool result; @@ -20532,12 +20525,12 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_ShouldInheritColours",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_ShouldInheritColours",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyScrolledWindow const *)arg1)->base_ShouldInheritColours(); + result = (bool)((wxPyScrolledWindow const *)arg1)->ShouldInheritColours(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20551,7 +20544,7 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, Py } -static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; wxVisualAttributes result; @@ -20560,12 +20553,12 @@ static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_GetDefaultAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_GetDefaultAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetDefaultAttributes(); + result = (arg1)->GetDefaultAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -20581,7 +20574,7 @@ static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, Py } -static PyObject *_wrap_PyScrolledWindow_base_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyScrolledWindow_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ; PyObject * obj0 = 0 ; @@ -20589,12 +20582,12 @@ static PyObject *_wrap_PyScrolledWindow_base_OnInternalIdle(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_OnInternalIdle",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_OnInternalIdle",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyScrolledWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnInternalIdle(); + (arg1)->OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24808,7 +24801,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_OnBeginDocument(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; int arg2 ; @@ -24821,7 +24814,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, (char *) "self",(char *) "startPage",(char *) "endPage", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -24834,7 +24827,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_OnBeginDocument(arg2,arg3); + result = (bool)(arg1)->OnBeginDocument(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24848,7 +24841,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, } -static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_OnEndDocument(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; PyObject * obj0 = 0 ; @@ -24856,12 +24849,12 @@ static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnEndDocument",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnEndDocument",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnEndDocument(); + (arg1)->OnEndDocument(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24873,7 +24866,7 @@ static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, P } -static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_OnBeginPrinting(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; PyObject * obj0 = 0 ; @@ -24881,12 +24874,12 @@ static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnBeginPrinting",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnBeginPrinting",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnBeginPrinting(); + (arg1)->OnBeginPrinting(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24898,7 +24891,7 @@ static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args, } -static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_OnEndPrinting(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; PyObject * obj0 = 0 ; @@ -24906,12 +24899,12 @@ static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, P (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnEndPrinting",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnEndPrinting",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnEndPrinting(); + (arg1)->OnEndPrinting(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24923,7 +24916,7 @@ static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, P } -static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_OnPreparePrinting(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; PyObject * obj0 = 0 ; @@ -24931,12 +24924,12 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *arg (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_OnPreparePrinting",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_OnPreparePrinting",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnPreparePrinting(); + (arg1)->OnPreparePrinting(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24948,7 +24941,7 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *arg } -static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_HasPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; int arg2 ; @@ -24959,7 +24952,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec (char *) "self",(char *) "page", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_HasPage",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -24968,7 +24961,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_HasPage(arg2); + result = (bool)(arg1)->HasPage(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -24982,7 +24975,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Printout_GetPageInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; int *arg2 = (int *) 0 ; @@ -25006,12 +24999,12 @@ static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *, PyObject *args, PyO arg3 = &temp3; res3 = SWIG_NEWOBJ; arg4 = &temp4; res4 = SWIG_NEWOBJ; arg5 = &temp5; res5 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_GetPageInfo",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageInfo",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_GetPageInfo(arg2,arg3,arg4,arg5); + (arg1)->GetPageInfo(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26648,7 +26641,7 @@ static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *, PyObject *arg } -static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; @@ -26659,7 +26652,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject * (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -26668,7 +26661,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_SetCurrentPage(arg2); + result = (bool)(arg1)->SetCurrentPage(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26682,7 +26675,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject * } -static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ; @@ -26695,7 +26688,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, (char *) "self",(char *) "canvas",(char *) "dc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_base_PaintPage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_PaintPage",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPreviewCanvas, SWIG_POINTER_EXCEPTION | 0); @@ -26710,7 +26703,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_PaintPage(arg2,*arg3); + result = (bool)(arg1)->PaintPage(arg2,*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26724,7 +26717,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ; @@ -26737,7 +26730,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a (char *) "self",(char *) "canvas",(char *) "dc", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_base_DrawBlankPage",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPrintPreview_DrawBlankPage",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPreviewCanvas, SWIG_POINTER_EXCEPTION | 0); @@ -26752,7 +26745,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_DrawBlankPage(arg2,*arg3); + result = (bool)(arg1)->DrawBlankPage(arg2,*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26766,7 +26759,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *a } -static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; @@ -26777,7 +26770,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args (char *) "self",(char *) "pageNum", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -26786,7 +26779,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_RenderPage(arg2); + result = (bool)(arg1)->RenderPage(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26800,7 +26793,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args } -static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; int arg2 ; @@ -26810,7 +26803,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P (char *) "self",(char *) "percent", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -26819,7 +26812,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetZoom(arg2); + (arg1)->SetZoom(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26831,7 +26824,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_Print(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; bool arg2 ; @@ -26842,7 +26835,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO (char *) "self",(char *) "interactive", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_Print",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -26851,7 +26844,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Print(arg2); + result = (bool)(arg1)->Print(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26865,7 +26858,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyO } -static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPrintPreview_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ; PyObject * obj0 = 0 ; @@ -26873,12 +26866,12 @@ static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPrintPreview_base_DetermineScaling",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPrintPreview_DetermineScaling",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintPreview, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DetermineScaling(); + (arg1)->DetermineScaling(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27080,7 +27073,7 @@ static PyObject *_wrap_PyPreviewFrame_SetControlBar(PyObject *, PyObject *args, } -static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPreviewFrame_Initialize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ; PyObject * obj0 = 0 ; @@ -27088,12 +27081,12 @@ static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_Initialize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_Initialize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_Initialize(); + (arg1)->Initialize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27105,7 +27098,7 @@ static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args } -static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPreviewFrame_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ; PyObject * obj0 = 0 ; @@ -27113,12 +27106,12 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *ar (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_CreateCanvas",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_CreateCanvas",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_CreateCanvas(); + (arg1)->CreateCanvas(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27130,7 +27123,7 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *ar } -static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPreviewFrame_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ; PyObject * obj0 = 0 ; @@ -27138,12 +27131,12 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_base_CreateControlBar",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewFrame_CreateControlBar",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_CreateControlBar(); + (arg1)->CreateControlBar(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27306,7 +27299,7 @@ static PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *, PyObject } -static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPreviewControlBar_CreateButtons(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ; PyObject * obj0 = 0 ; @@ -27314,12 +27307,12 @@ static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewControlBar_base_CreateButtons",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPreviewControlBar_CreateButtons",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewControlBar, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_CreateButtons(); + (arg1)->CreateButtons(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27331,7 +27324,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObje } -static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyPreviewControlBar_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ; int arg2 ; @@ -27341,7 +27334,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObj (char *) "self",(char *) "zoom", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPreviewControlBar, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -27350,7 +27343,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObj } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetZoomControl(arg2); + (arg1)->SetZoomControl(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -27796,81 +27789,81 @@ static PyMethodDef SwigMethods[] = { { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_SetBestSize", (PyCFunction) _wrap_PyWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_DoEraseBackground", (PyCFunction) _wrap_PyWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoSetSize", (PyCFunction) _wrap_PyWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoGetSize", (PyCFunction) _wrap_PyWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoGetPosition", (PyCFunction) _wrap_PyWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_InitDialog", (PyCFunction) _wrap_PyWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_Validate", (PyCFunction) _wrap_PyWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_GetMaxSize", (PyCFunction) _wrap_PyWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_AddChild", (PyCFunction) _wrap_PyWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_RemoveChild", (PyCFunction) _wrap_PyWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWindow_base_OnInternalIdle", (PyCFunction) _wrap_PyWindow_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoMoveWindow", (PyCFunction) _wrap_PyWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoSetSize", (PyCFunction) _wrap_PyWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoSetClientSize", (PyCFunction) _wrap_PyWindow_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoGetSize", (PyCFunction) _wrap_PyWindow_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoGetClientSize", (PyCFunction) _wrap_PyWindow_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoGetPosition", (PyCFunction) _wrap_PyWindow_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_DoGetBestSize", (PyCFunction) _wrap_PyWindow_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_InitDialog", (PyCFunction) _wrap_PyWindow_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_Validate", (PyCFunction) _wrap_PyWindow_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_AcceptsFocus", (PyCFunction) _wrap_PyWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_GetMaxSize", (PyCFunction) _wrap_PyWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_AddChild", (PyCFunction) _wrap_PyWindow_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_RemoveChild", (PyCFunction) _wrap_PyWindow_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWindow_OnInternalIdle", (PyCFunction) _wrap_PyWindow_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWindow_swigregister", PyWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PrePyPanel", (PyCFunction) _wrap_new_PrePyPanel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_SetBestSize", (PyCFunction) _wrap_PyPanel_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_DoEraseBackground", (PyCFunction) _wrap_PyPanel_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoMoveWindow", (PyCFunction) _wrap_PyPanel_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoSetSize", (PyCFunction) _wrap_PyPanel_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoSetClientSize", (PyCFunction) _wrap_PyPanel_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoGetSize", (PyCFunction) _wrap_PyPanel_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoGetClientSize", (PyCFunction) _wrap_PyPanel_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoGetPosition", (PyCFunction) _wrap_PyPanel_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_DoGetBestSize", (PyCFunction) _wrap_PyPanel_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_InitDialog", (PyCFunction) _wrap_PyPanel_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_Validate", (PyCFunction) _wrap_PyPanel_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_AcceptsFocus", (PyCFunction) _wrap_PyPanel_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_GetMaxSize", (PyCFunction) _wrap_PyPanel_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_AddChild", (PyCFunction) _wrap_PyPanel_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_RemoveChild", (PyCFunction) _wrap_PyPanel_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPanel_base_OnInternalIdle", (PyCFunction) _wrap_PyPanel_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoMoveWindow", (PyCFunction) _wrap_PyPanel_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoSetSize", (PyCFunction) _wrap_PyPanel_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoSetClientSize", (PyCFunction) _wrap_PyPanel_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoGetSize", (PyCFunction) _wrap_PyPanel_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoGetClientSize", (PyCFunction) _wrap_PyPanel_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoGetPosition", (PyCFunction) _wrap_PyPanel_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_DoGetBestSize", (PyCFunction) _wrap_PyPanel_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_InitDialog", (PyCFunction) _wrap_PyPanel_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_Validate", (PyCFunction) _wrap_PyPanel_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_AcceptsFocus", (PyCFunction) _wrap_PyPanel_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_GetMaxSize", (PyCFunction) _wrap_PyPanel_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_AddChild", (PyCFunction) _wrap_PyPanel_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_RemoveChild", (PyCFunction) _wrap_PyPanel_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPanel_OnInternalIdle", (PyCFunction) _wrap_PyPanel_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPanel_swigregister", PyPanel_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PrePyScrolledWindow", (PyCFunction) _wrap_new_PrePyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_SetBestSize", (PyCFunction) _wrap_PyScrolledWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_DoEraseBackground", (PyCFunction) _wrap_PyScrolledWindow_DoEraseBackground, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_Validate", (PyCFunction) _wrap_PyScrolledWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_AddChild", (PyCFunction) _wrap_PyScrolledWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyScrolledWindow_base_OnInternalIdle", (PyCFunction) _wrap_PyScrolledWindow_base_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_Validate", (PyCFunction) _wrap_PyScrolledWindow_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_AddChild", (PyCFunction) _wrap_PyScrolledWindow_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyScrolledWindow_OnInternalIdle", (PyCFunction) _wrap_PyScrolledWindow_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyScrolledWindow_swigregister", PyScrolledWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_PrintData", _wrap_new_PrintData, METH_VARARGS, NULL}, { (char *)"delete_PrintData", (PyCFunction) _wrap_delete_PrintData, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -28005,13 +27998,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"Printout_GetPPIPrinter", (PyCFunction) _wrap_Printout_GetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Printout_IsPreview", (PyCFunction) _wrap_Printout_IsPreview, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_OnBeginDocument", (PyCFunction) _wrap_Printout_base_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_OnEndDocument", (PyCFunction) _wrap_Printout_base_OnEndDocument, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_OnBeginPrinting", (PyCFunction) _wrap_Printout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_OnEndPrinting", (PyCFunction) _wrap_Printout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_OnPreparePrinting", (PyCFunction) _wrap_Printout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_HasPage", (PyCFunction) _wrap_Printout_base_HasPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_OnBeginDocument", (PyCFunction) _wrap_Printout_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_OnEndDocument", (PyCFunction) _wrap_Printout_OnEndDocument, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_OnBeginPrinting", (PyCFunction) _wrap_Printout_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_OnEndPrinting", (PyCFunction) _wrap_Printout_OnEndPrinting, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_OnPreparePrinting", (PyCFunction) _wrap_Printout_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_HasPage", (PyCFunction) _wrap_Printout_HasPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Printout_GetPageInfo", (PyCFunction) _wrap_Printout_GetPageInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Printout_swigregister", Printout_swigregister, METH_VARARGS, NULL}, { (char *)"new_PreviewCanvas", (PyCFunction) _wrap_new_PreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PreviewCanvas_swigregister", PreviewCanvas_swigregister, METH_VARARGS, NULL}, @@ -28057,27 +28050,27 @@ static PyMethodDef SwigMethods[] = { { (char *)"PrintPreview_swigregister", PrintPreview_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyPrintPreview", _wrap_new_PyPrintPreview, METH_VARARGS, NULL}, { (char *)"PyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_PyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_PaintPage", (PyCFunction) _wrap_PyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_base_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_RenderPage", (PyCFunction) _wrap_PyPrintPreview_base_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_SetZoom", (PyCFunction) _wrap_PyPrintPreview_base_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_Print", (PyCFunction) _wrap_PyPrintPreview_base_Print, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPrintPreview_base_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_base_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_PaintPage", (PyCFunction) _wrap_PyPrintPreview_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_RenderPage", (PyCFunction) _wrap_PyPrintPreview_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_SetZoom", (PyCFunction) _wrap_PyPrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_Print", (PyCFunction) _wrap_PyPrintPreview_Print, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPrintPreview_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPrintPreview_swigregister", PyPrintPreview_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyPreviewFrame", (PyCFunction) _wrap_new_PyPreviewFrame, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewFrame__setCallbackInfo", (PyCFunction) _wrap_PyPreviewFrame__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewFrame_SetPreviewCanvas", (PyCFunction) _wrap_PyPreviewFrame_SetPreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewFrame_SetControlBar", (PyCFunction) _wrap_PyPreviewFrame_SetControlBar, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPreviewFrame_base_Initialize", (PyCFunction) _wrap_PyPreviewFrame_base_Initialize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPreviewFrame_base_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_base_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPreviewFrame_base_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_base_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPreviewFrame_Initialize", (PyCFunction) _wrap_PyPreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPreviewFrame_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPreviewFrame_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewFrame_swigregister", PyPreviewFrame_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyPreviewControlBar", (PyCFunction) _wrap_new_PyPreviewControlBar, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewControlBar__setCallbackInfo", (PyCFunction) _wrap_PyPreviewControlBar__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewControlBar_SetPrintPreview", (PyCFunction) _wrap_PyPreviewControlBar_SetPrintPreview, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPreviewControlBar_base_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_base_CreateButtons, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyPreviewControlBar_base_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_base_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPreviewControlBar_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_CreateButtons, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyPreviewControlBar_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyPreviewControlBar_swigregister", PyPreviewControlBar_swigregister, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } }; diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index 31c0d4da8e..f8c206e306 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -134,9 +134,14 @@ class PyGridCellRenderer(GridCellRenderer): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _grid.PyGridCellRenderer__setCallbackInfo(*args, **kwargs) - def base_SetParameters(*args, **kwargs): - """base_SetParameters(self, String params)""" - return _grid.PyGridCellRenderer_base_SetParameters(*args, **kwargs) + def SetParameters(*args, **kwargs): + """SetParameters(self, String params)""" + return _grid.PyGridCellRenderer_SetParameters(*args, **kwargs) + + def base_SetParameters(*args, **kw): + return PyGridCellRenderer.SetParameters(*args, **kw) + base_SetParameters = wx._deprecated(base_SetParameters, + "Please use PyGridCellRenderer.SetParameters instead.") class PyGridCellRendererPtr(PyGridCellRenderer): @@ -421,41 +426,88 @@ class PyGridCellEditor(GridCellEditor): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _grid.PyGridCellEditor__setCallbackInfo(*args, **kwargs) - def base_SetSize(*args, **kwargs): - """base_SetSize(self, Rect rect)""" - return _grid.PyGridCellEditor_base_SetSize(*args, **kwargs) + def SetSize(*args, **kwargs): + """SetSize(self, Rect rect)""" + return _grid.PyGridCellEditor_SetSize(*args, **kwargs) - def base_Show(*args, **kwargs): - """base_Show(self, bool show, GridCellAttr attr=None)""" - return _grid.PyGridCellEditor_base_Show(*args, **kwargs) + def Show(*args, **kwargs): + """Show(self, bool show, GridCellAttr attr=None)""" + return _grid.PyGridCellEditor_Show(*args, **kwargs) - def base_PaintBackground(*args, **kwargs): - """base_PaintBackground(self, Rect rectCell, GridCellAttr attr)""" - return _grid.PyGridCellEditor_base_PaintBackground(*args, **kwargs) + def PaintBackground(*args, **kwargs): + """PaintBackground(self, Rect rectCell, GridCellAttr attr)""" + return _grid.PyGridCellEditor_PaintBackground(*args, **kwargs) - def base_IsAcceptedKey(*args, **kwargs): - """base_IsAcceptedKey(self, KeyEvent event) -> bool""" - return _grid.PyGridCellEditor_base_IsAcceptedKey(*args, **kwargs) + def IsAcceptedKey(*args, **kwargs): + """IsAcceptedKey(self, KeyEvent event) -> bool""" + return _grid.PyGridCellEditor_IsAcceptedKey(*args, **kwargs) - def base_StartingKey(*args, **kwargs): - """base_StartingKey(self, KeyEvent event)""" - return _grid.PyGridCellEditor_base_StartingKey(*args, **kwargs) + def StartingKey(*args, **kwargs): + """StartingKey(self, KeyEvent event)""" + return _grid.PyGridCellEditor_StartingKey(*args, **kwargs) - def base_StartingClick(*args, **kwargs): - """base_StartingClick(self)""" - return _grid.PyGridCellEditor_base_StartingClick(*args, **kwargs) + def StartingClick(*args, **kwargs): + """StartingClick(self)""" + return _grid.PyGridCellEditor_StartingClick(*args, **kwargs) - def base_HandleReturn(*args, **kwargs): - """base_HandleReturn(self, KeyEvent event)""" - return _grid.PyGridCellEditor_base_HandleReturn(*args, **kwargs) + def HandleReturn(*args, **kwargs): + """HandleReturn(self, KeyEvent event)""" + return _grid.PyGridCellEditor_HandleReturn(*args, **kwargs) - def base_Destroy(*args, **kwargs): - """base_Destroy(self)""" - return _grid.PyGridCellEditor_base_Destroy(*args, **kwargs) + def Destroy(*args, **kwargs): + """Destroy(self)""" + val = _grid.PyGridCellEditor_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val - def base_SetParameters(*args, **kwargs): - """base_SetParameters(self, String params)""" - return _grid.PyGridCellEditor_base_SetParameters(*args, **kwargs) + def SetParameters(*args, **kwargs): + """SetParameters(self, String params)""" + return _grid.PyGridCellEditor_SetParameters(*args, **kwargs) + + def base_SetSize(*args, **kw): + return PyGridCellEditor.SetSize(*args, **kw) + base_SetSize = wx._deprecated(base_SetSize, + "Please use PyGridCellEditor.SetSize instead.") + + def base_Show(*args, **kw): + return PyGridCellEditor.Show(*args, **kw) + base_Show = wx._deprecated(base_Show, + "Please use PyGridCellEditor.Show instead.") + + def base_PaintBackground(*args, **kw): + return PyGridCellEditor.PaintBackground(*args, **kw) + base_PaintBackground = wx._deprecated(base_PaintBackground, + "Please use PyGridCellEditor.PaintBackground instead.") + + def base_IsAcceptedKey(*args, **kw): + return PyGridCellEditor.IsAcceptedKey(*args, **kw) + base_IsAcceptedKey = wx._deprecated(base_IsAcceptedKey, + "Please use PyGridCellEditor.IsAcceptedKey instead.") + + def base_StartingKey(*args, **kw): + return PyGridCellEditor.StartingKey(*args, **kw) + base_StartingKey = wx._deprecated(base_StartingKey, + "Please use PyGridCellEditor.StartingKey instead.") + + def base_StartingClick(*args, **kw): + return PyGridCellEditor.StartingClick(*args, **kw) + base_StartingClick = wx._deprecated(base_StartingClick, + "Please use PyGridCellEditor.StartingClick instead.") + + def base_HandleReturn(*args, **kw): + return PyGridCellEditor.HandleReturn(*args, **kw) + base_HandleReturn = wx._deprecated(base_HandleReturn, + "Please use PyGridCellEditor.HandleReturn instead.") + + def base_Destroy(*args, **kw): + return PyGridCellEditor.Destroy(*args, **kw) + base_Destroy = wx._deprecated(base_Destroy, + "Please use PyGridCellEditor.Destroy instead.") + + def base_SetParameters(*args, **kw): + return PyGridCellEditor.SetParameters(*args, **kw) + base_SetParameters = wx._deprecated(base_SetParameters, + "Please use PyGridCellEditor.SetParameters instead.") class PyGridCellEditorPtr(PyGridCellEditor): @@ -859,21 +911,41 @@ class PyGridCellAttrProvider(GridCellAttrProvider): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _grid.PyGridCellAttrProvider__setCallbackInfo(*args, **kwargs) - def base_GetAttr(*args, **kwargs): - """base_GetAttr(self, int row, int col, int kind) -> GridCellAttr""" - return _grid.PyGridCellAttrProvider_base_GetAttr(*args, **kwargs) + def GetAttr(*args, **kwargs): + """GetAttr(self, int row, int col, int kind) -> GridCellAttr""" + return _grid.PyGridCellAttrProvider_GetAttr(*args, **kwargs) + + def SetAttr(*args, **kwargs): + """SetAttr(self, GridCellAttr attr, int row, int col)""" + return _grid.PyGridCellAttrProvider_SetAttr(*args, **kwargs) + + def SetRowAttr(*args, **kwargs): + """SetRowAttr(self, GridCellAttr attr, int row)""" + return _grid.PyGridCellAttrProvider_SetRowAttr(*args, **kwargs) - def base_SetAttr(*args, **kwargs): - """base_SetAttr(self, GridCellAttr attr, int row, int col)""" - return _grid.PyGridCellAttrProvider_base_SetAttr(*args, **kwargs) + def SetColAttr(*args, **kwargs): + """SetColAttr(self, GridCellAttr attr, int col)""" + return _grid.PyGridCellAttrProvider_SetColAttr(*args, **kwargs) - def base_SetRowAttr(*args, **kwargs): - """base_SetRowAttr(self, GridCellAttr attr, int row)""" - return _grid.PyGridCellAttrProvider_base_SetRowAttr(*args, **kwargs) + def base_GetAttr(*args, **kw): + return PyGridCellAttrProvider.GetAttr(*args, **kw) + base_GetAttr = wx._deprecated(base_GetAttr, + "Please use PyGridCellAttrProvider.GetAttr instead.") - def base_SetColAttr(*args, **kwargs): - """base_SetColAttr(self, GridCellAttr attr, int col)""" - return _grid.PyGridCellAttrProvider_base_SetColAttr(*args, **kwargs) + def base_SetAttr(*args, **kw): + return PyGridCellAttrProvider.SetAttr(*args, **kw) + base_SetAttr = wx._deprecated(base_SetAttr, + "Please use PyGridCellAttrProvider.SetAttr instead.") + + def base_SetRowAttr(*args, **kw): + return PyGridCellAttrProvider.SetRowAttr(*args, **kw) + base_SetRowAttr = wx._deprecated(base_SetRowAttr, + "Please use PyGridCellAttrProvider.SetRowAttr instead.") + + def base_SetColAttr(*args, **kw): + return PyGridCellAttrProvider.SetColAttr(*args, **kw) + base_SetColAttr = wx._deprecated(base_SetColAttr, + "Please use PyGridCellAttrProvider.SetColAttr instead.") class PyGridCellAttrProviderPtr(PyGridCellAttrProvider): @@ -1062,81 +1134,176 @@ class PyGridTableBase(GridTableBase): args[0].thisown = 0 return val - def base_GetTypeName(*args, **kwargs): - """base_GetTypeName(self, int row, int col) -> String""" - return _grid.PyGridTableBase_base_GetTypeName(*args, **kwargs) + def GetTypeName(*args, **kwargs): + """GetTypeName(self, int row, int col) -> String""" + return _grid.PyGridTableBase_GetTypeName(*args, **kwargs) - def base_CanGetValueAs(*args, **kwargs): - """base_CanGetValueAs(self, int row, int col, String typeName) -> bool""" - return _grid.PyGridTableBase_base_CanGetValueAs(*args, **kwargs) + def CanGetValueAs(*args, **kwargs): + """CanGetValueAs(self, int row, int col, String typeName) -> bool""" + return _grid.PyGridTableBase_CanGetValueAs(*args, **kwargs) - def base_CanSetValueAs(*args, **kwargs): - """base_CanSetValueAs(self, int row, int col, String typeName) -> bool""" - return _grid.PyGridTableBase_base_CanSetValueAs(*args, **kwargs) + def CanSetValueAs(*args, **kwargs): + """CanSetValueAs(self, int row, int col, String typeName) -> bool""" + return _grid.PyGridTableBase_CanSetValueAs(*args, **kwargs) - def base_Clear(*args, **kwargs): - """base_Clear(self)""" - return _grid.PyGridTableBase_base_Clear(*args, **kwargs) + def Clear(*args, **kwargs): + """Clear(self)""" + return _grid.PyGridTableBase_Clear(*args, **kwargs) - def base_InsertRows(*args, **kwargs): - """base_InsertRows(self, size_t pos=0, size_t numRows=1) -> bool""" - return _grid.PyGridTableBase_base_InsertRows(*args, **kwargs) + def InsertRows(*args, **kwargs): + """InsertRows(self, size_t pos=0, size_t numRows=1) -> bool""" + return _grid.PyGridTableBase_InsertRows(*args, **kwargs) - def base_AppendRows(*args, **kwargs): - """base_AppendRows(self, size_t numRows=1) -> bool""" - return _grid.PyGridTableBase_base_AppendRows(*args, **kwargs) + def AppendRows(*args, **kwargs): + """AppendRows(self, size_t numRows=1) -> bool""" + return _grid.PyGridTableBase_AppendRows(*args, **kwargs) - def base_DeleteRows(*args, **kwargs): - """base_DeleteRows(self, size_t pos=0, size_t numRows=1) -> bool""" - return _grid.PyGridTableBase_base_DeleteRows(*args, **kwargs) + def DeleteRows(*args, **kwargs): + """DeleteRows(self, size_t pos=0, size_t numRows=1) -> bool""" + return _grid.PyGridTableBase_DeleteRows(*args, **kwargs) - def base_InsertCols(*args, **kwargs): - """base_InsertCols(self, size_t pos=0, size_t numCols=1) -> bool""" - return _grid.PyGridTableBase_base_InsertCols(*args, **kwargs) + def InsertCols(*args, **kwargs): + """InsertCols(self, size_t pos=0, size_t numCols=1) -> bool""" + return _grid.PyGridTableBase_InsertCols(*args, **kwargs) - def base_AppendCols(*args, **kwargs): - """base_AppendCols(self, size_t numCols=1) -> bool""" - return _grid.PyGridTableBase_base_AppendCols(*args, **kwargs) + def AppendCols(*args, **kwargs): + """AppendCols(self, size_t numCols=1) -> bool""" + return _grid.PyGridTableBase_AppendCols(*args, **kwargs) - def base_DeleteCols(*args, **kwargs): - """base_DeleteCols(self, size_t pos=0, size_t numCols=1) -> bool""" - return _grid.PyGridTableBase_base_DeleteCols(*args, **kwargs) + def DeleteCols(*args, **kwargs): + """DeleteCols(self, size_t pos=0, size_t numCols=1) -> bool""" + return _grid.PyGridTableBase_DeleteCols(*args, **kwargs) - def base_GetRowLabelValue(*args, **kwargs): - """base_GetRowLabelValue(self, int row) -> String""" - return _grid.PyGridTableBase_base_GetRowLabelValue(*args, **kwargs) + def GetRowLabelValue(*args, **kwargs): + """GetRowLabelValue(self, int row) -> String""" + return _grid.PyGridTableBase_GetRowLabelValue(*args, **kwargs) - def base_GetColLabelValue(*args, **kwargs): - """base_GetColLabelValue(self, int col) -> String""" - return _grid.PyGridTableBase_base_GetColLabelValue(*args, **kwargs) + def GetColLabelValue(*args, **kwargs): + """GetColLabelValue(self, int col) -> String""" + return _grid.PyGridTableBase_GetColLabelValue(*args, **kwargs) - def base_SetRowLabelValue(*args, **kwargs): - """base_SetRowLabelValue(self, int row, String value)""" - return _grid.PyGridTableBase_base_SetRowLabelValue(*args, **kwargs) + def SetRowLabelValue(*args, **kwargs): + """SetRowLabelValue(self, int row, String value)""" + return _grid.PyGridTableBase_SetRowLabelValue(*args, **kwargs) - def base_SetColLabelValue(*args, **kwargs): - """base_SetColLabelValue(self, int col, String value)""" - return _grid.PyGridTableBase_base_SetColLabelValue(*args, **kwargs) + def SetColLabelValue(*args, **kwargs): + """SetColLabelValue(self, int col, String value)""" + return _grid.PyGridTableBase_SetColLabelValue(*args, **kwargs) - def base_CanHaveAttributes(*args, **kwargs): - """base_CanHaveAttributes(self) -> bool""" - return _grid.PyGridTableBase_base_CanHaveAttributes(*args, **kwargs) + def CanHaveAttributes(*args, **kwargs): + """CanHaveAttributes(self) -> bool""" + return _grid.PyGridTableBase_CanHaveAttributes(*args, **kwargs) - def base_GetAttr(*args, **kwargs): - """base_GetAttr(self, int row, int col, int kind) -> GridCellAttr""" - return _grid.PyGridTableBase_base_GetAttr(*args, **kwargs) + def GetAttr(*args, **kwargs): + """GetAttr(self, int row, int col, int kind) -> GridCellAttr""" + return _grid.PyGridTableBase_GetAttr(*args, **kwargs) - def base_SetAttr(*args, **kwargs): - """base_SetAttr(self, GridCellAttr attr, int row, int col)""" - return _grid.PyGridTableBase_base_SetAttr(*args, **kwargs) + def SetAttr(*args, **kwargs): + """SetAttr(self, GridCellAttr attr, int row, int col)""" + return _grid.PyGridTableBase_SetAttr(*args, **kwargs) - def base_SetRowAttr(*args, **kwargs): - """base_SetRowAttr(self, GridCellAttr attr, int row)""" - return _grid.PyGridTableBase_base_SetRowAttr(*args, **kwargs) + def SetRowAttr(*args, **kwargs): + """SetRowAttr(self, GridCellAttr attr, int row)""" + return _grid.PyGridTableBase_SetRowAttr(*args, **kwargs) - def base_SetColAttr(*args, **kwargs): - """base_SetColAttr(self, GridCellAttr attr, int col)""" - return _grid.PyGridTableBase_base_SetColAttr(*args, **kwargs) + def SetColAttr(*args, **kwargs): + """SetColAttr(self, GridCellAttr attr, int col)""" + return _grid.PyGridTableBase_SetColAttr(*args, **kwargs) + + def base_GetTypeName(*args, **kw): + return PyGridTableBase.GetTypeName(*args, **kw) + base_GetTypeName = wx._deprecated(base_GetTypeName, + "Please use PyGridTableBase.GetTypeName instead.") + + def base_CanGetValueAs(*args, **kw): + return PyGridTableBase.CanGetValueAs(*args, **kw) + base_CanGetValueAs = wx._deprecated(base_CanGetValueAs, + "Please use PyGridTableBase.CanGetValueAs instead.") + + def base_CanSetValueAs(*args, **kw): + return PyGridTableBase.CanSetValueAs(*args, **kw) + base_CanSetValueAs = wx._deprecated(base_CanSetValueAs, + "Please use PyGridTableBase.CanSetValueAs instead.") + + def base_Clear(*args, **kw): + return PyGridTableBase.Clear(*args, **kw) + base_Clear = wx._deprecated(base_Clear, + "Please use PyGridTableBase.Clear instead.") + + def base_InsertRows(*args, **kw): + return PyGridTableBase.InsertRows(*args, **kw) + base_InsertRows = wx._deprecated(base_InsertRows, + "Please use PyGridTableBase.InsertRows instead.") + + def base_AppendRows(*args, **kw): + return PyGridTableBase.AppendRows(*args, **kw) + base_AppendRows = wx._deprecated(base_AppendRows, + "Please use PyGridTableBase.AppendRows instead.") + + def base_DeleteRows(*args, **kw): + return PyGridTableBase.DeleteRows(*args, **kw) + base_DeleteRows = wx._deprecated(base_DeleteRows, + "Please use PyGridTableBase.DeleteRows instead.") + + def base_InsertCols(*args, **kw): + return PyGridTableBase.InsertCols(*args, **kw) + base_InsertCols = wx._deprecated(base_InsertCols, + "Please use PyGridTableBase.InsertCols instead.") + + def base_AppendCols(*args, **kw): + return PyGridTableBase.AppendCols(*args, **kw) + base_AppendCols = wx._deprecated(base_AppendCols, + "Please use PyGridTableBase.AppendCols instead.") + + def base_DeleteCols(*args, **kw): + return PyGridTableBase.DeleteCols(*args, **kw) + base_DeleteCols = wx._deprecated(base_DeleteCols, + "Please use PyGridTableBase.DeleteCols instead.") + + def base_GetRowLabelValue(*args, **kw): + return PyGridTableBase.GetRowLabelValue(*args, **kw) + base_GetRowLabelValue = wx._deprecated(base_GetRowLabelValue, + "Please use PyGridTableBase.GetRowLabelValue instead.") + + def base_GetColLabelValue(*args, **kw): + return PyGridTableBase.GetColLabelValue(*args, **kw) + base_GetColLabelValue = wx._deprecated(base_GetColLabelValue, + "Please use PyGridTableBase.GetColLabelValue instead.") + + def base_SetRowLabelValue(*args, **kw): + return PyGridTableBase.SetRowLabelValue(*args, **kw) + base_SetRowLabelValue = wx._deprecated(base_SetRowLabelValue, + "Please use PyGridTableBase.SetRowLabelValue instead.") + + def base_SetColLabelValue(*args, **kw): + return PyGridTableBase.SetColLabelValue(*args, **kw) + base_SetColLabelValue = wx._deprecated(base_SetColLabelValue, + "Please use PyGridTableBase.SetColLabelValue instead.") + + def base_CanHaveAttributes(*args, **kw): + return PyGridTableBase.CanHaveAttributes(*args, **kw) + base_CanHaveAttributes = wx._deprecated(base_CanHaveAttributes, + "Please use PyGridTableBase.CanHaveAttributes instead.") + + def base_GetAttr(*args, **kw): + return PyGridTableBase.GetAttr(*args, **kw) + base_GetAttr = wx._deprecated(base_GetAttr, + "Please use PyGridTableBase.GetAttr instead.") + + def base_SetAttr(*args, **kw): + return PyGridTableBase.SetAttr(*args, **kw) + base_SetAttr = wx._deprecated(base_SetAttr, + "Please use PyGridTableBase.SetAttr instead.") + + def base_SetRowAttr(*args, **kw): + return PyGridTableBase.SetRowAttr(*args, **kw) + base_SetRowAttr = wx._deprecated(base_SetRowAttr, + "Please use PyGridTableBase.SetRowAttr instead.") + + def base_SetColAttr(*args, **kw): + return PyGridTableBase.SetColAttr(*args, **kw) + base_SetColAttr = wx._deprecated(base_SetColAttr, + "Please use PyGridTableBase.SetColAttr instead.") class PyGridTableBasePtr(PyGridTableBase): diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 02f48ca9a6..9d61e85f15 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -1702,11 +1702,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a, b, c); \ return rval; \ - } \ - wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \ - return PCLASS::CBNAME(a, b, c); \ - } - + } #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \ @@ -1721,10 +1717,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(attr, a, b); \ - } \ - void base_##CBNAME(wxGridCellAttr *attr, int a, int b) { \ - PCLASS::CBNAME(attr, a, b); \ - } + } @@ -1740,10 +1733,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(attr, val); \ - } \ - void base_##CBNAME(wxGridCellAttr *attr, int val) { \ - PCLASS::CBNAME(attr, val); \ - } + } @@ -1816,10 +1806,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ - } \ - wxString base_##CBNAME(int a, int b) { \ - return PCLASS::CBNAME(a, b); \ - } + } #define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME) \ @@ -1836,10 +1823,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a,b,c); \ return rval; \ - } \ - bool base_##CBNAME(int a, int b, const wxString& c) { \ - return PCLASS::CBNAME(a,b,c); \ - } + } @@ -1855,11 +1839,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ - } \ - long base_##CBNAME(int a, int b) { \ - return PCLASS::CBNAME(a,b); \ - } - + } #define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME) \ @@ -1873,10 +1853,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ - } \ - bool base_##CBNAME(int a, int b) { \ - return PCLASS::CBNAME(a,b); \ - } + } @@ -1898,10 +1875,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ - } \ - double base_##CBNAME(int a, int b) { \ - return PCLASS::CBNAME(a, b); \ - } + } @@ -1914,11 +1888,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ - } \ - void base_##CBNAME() { \ - PCLASS::CBNAME(); \ - } - + } @@ -1933,10 +1903,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ - } \ - bool base_##CBNAME(size_t a, size_t b) { \ - return PCLASS::CBNAME(a,b); \ - } + } @@ -1951,10 +1918,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ - } \ - bool base_##CBNAME(size_t a) { \ - return PCLASS::CBNAME(a); \ - } + } #define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \ @@ -1974,10 +1938,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ - } \ - wxString base_##CBNAME(int a) { \ - return PCLASS::CBNAME(a); \ - } + } #define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \ @@ -1992,10 +1953,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,c); \ - } \ - void base_##CBNAME(int a, const wxString& c) { \ - PCLASS::CBNAME(a,c); \ - } + } @@ -2011,10 +1969,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ - } \ - bool base_##CBNAME() { \ - return PCLASS::CBNAME(); \ - } + } @@ -2027,10 +1982,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ - } \ - void base_##CBNAME(size_t a, int b) { \ - PCLASS::CBNAME(a,b); \ - } + } @@ -2044,10 +1996,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ - } \ - void base_##CBNAME(int a, int b, long c) { \ - PCLASS::CBNAME(a,b,c); \ - } + } @@ -2061,10 +2010,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ - } \ - void base_##CBNAME(int a, int b, double c) { \ - PCLASS::CBNAME(a,b,c); \ - } + } @@ -2077,11 +2023,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ - } \ - void base_##CBNAME(int a, int b, bool c) { \ - PCLASS::CBNAME(a,b,c); \ - } - + } @@ -2439,9 +2381,6 @@ public: if (! found) wxGridCellEditor::Show(show, attr); } - void base_Show(bool show, wxGridCellAttr *attr) { - wxGridCellEditor::Show(show, attr); - } void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { @@ -2460,9 +2399,6 @@ public: if (! found) wxGridCellEditor::PaintBackground(rectCell, attr); } - void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { - wxGridCellEditor::PaintBackground(rectCell, attr); - } DEC_PYCALLBACK___pure(Reset); @@ -3247,7 +3183,7 @@ static PyObject *_wrap_PyGridCellRenderer__setCallbackInfo(PyObject *, PyObject } -static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellRenderer_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellRenderer *arg1 = (wxPyGridCellRenderer *) 0 ; wxString *arg2 = 0 ; @@ -3258,7 +3194,7 @@ static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *, PyObjec (char *) "self",(char *) "params", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellRenderer_base_SetParameters",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellRenderer_SetParameters",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellRenderer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -3268,7 +3204,7 @@ static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetParameters((wxString const &)*arg2); + (arg1)->SetParameters((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4432,7 +4368,7 @@ static PyObject *_wrap_PyGridCellEditor__setCallbackInfo(PyObject *, PyObject *a } -static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_SetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxRect *arg2 = 0 ; @@ -4443,7 +4379,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *, PyObject *args, (char *) "self",(char *) "rect", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_base_SetSize",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_SetSize",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4452,7 +4388,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetSize((wxRect const &)*arg2); + (arg1)->SetSize((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4464,7 +4400,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_Show(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; bool arg2 ; @@ -4476,7 +4412,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *, PyObject *args, Py (char *) "self",(char *) "show",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyGridCellEditor_base_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyGridCellEditor_Show",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4489,7 +4425,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_Show(arg2,arg3); + (arg1)->Show(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4501,7 +4437,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_PaintBackground(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxRect *arg2 = 0 ; @@ -4514,7 +4450,7 @@ static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *, PyObjec (char *) "self",(char *) "rectCell",(char *) "attr", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellEditor_base_PaintBackground",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellEditor_PaintBackground",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4525,7 +4461,7 @@ static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *, PyObjec if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_PaintBackground((wxRect const &)*arg2,arg3); + (arg1)->PaintBackground((wxRect const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4537,7 +4473,7 @@ static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *, PyObjec } -static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_IsAcceptedKey(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxKeyEvent *arg2 = 0 ; @@ -4548,7 +4484,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *, PyObject (char *) "self",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_base_IsAcceptedKey",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_IsAcceptedKey",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4561,7 +4497,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_IsAcceptedKey(*arg2); + result = (bool)(arg1)->IsAcceptedKey(*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4575,7 +4511,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *, PyObject } -static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_StartingKey(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxKeyEvent *arg2 = 0 ; @@ -4585,7 +4521,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *, PyObject *a (char *) "self",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_base_StartingKey",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_StartingKey",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4598,7 +4534,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *, PyObject *a } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_StartingKey(*arg2); + (arg1)->StartingKey(*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4610,7 +4546,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *, PyObject *a } -static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_StartingClick(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; PyObject * obj0 = 0 ; @@ -4618,12 +4554,12 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *, PyObject (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridCellEditor_base_StartingClick",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridCellEditor_StartingClick",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_StartingClick(); + (arg1)->StartingClick(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4635,7 +4571,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *, PyObject } -static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_HandleReturn(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxKeyEvent *arg2 = 0 ; @@ -4645,7 +4581,7 @@ static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *, PyObject * (char *) "self",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_base_HandleReturn",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_HandleReturn",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4658,7 +4594,7 @@ static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_HandleReturn(*arg2); + (arg1)->HandleReturn(*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4670,7 +4606,7 @@ static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *, PyObject * } -static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; PyObject * obj0 = 0 ; @@ -4678,12 +4614,12 @@ static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridCellEditor_base_Destroy",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridCellEditor_Destroy",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_Destroy(); + (arg1)->Destroy(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -4695,7 +4631,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *, PyObject *args, } -static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellEditor_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ; wxString *arg2 = 0 ; @@ -4706,7 +4642,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *, PyObject (char *) "self",(char *) "params", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_base_SetParameters",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridCellEditor_SetParameters",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellEditor, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -4716,7 +4652,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetParameters((wxString const &)*arg2); + (arg1)->SetParameters((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6675,7 +6611,7 @@ static PyObject *_wrap_PyGridCellAttrProvider__setCallbackInfo(PyObject *, PyObj } -static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellAttrProvider_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ; int arg2 ; @@ -6690,7 +6626,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellAttrProvider, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -6707,7 +6643,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,arg4); + result = (wxGridCellAttr *)(arg1)->GetAttr(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6721,7 +6657,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject } -static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellAttrProvider_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -6735,7 +6671,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *, PyObject (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellAttrProvider, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -6750,7 +6686,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetAttr(arg2,arg3,arg4); + (arg1)->SetAttr(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6762,7 +6698,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *, PyObject } -static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellAttrProvider_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -6774,7 +6710,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *, PyObje (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellAttrProvider, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -6785,7 +6721,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetRowAttr(arg2,arg3); + (arg1)->SetRowAttr(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -6797,7 +6733,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *, PyObje } -static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridCellAttrProvider_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -6809,7 +6745,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *, PyObje (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridCellAttrProvider_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridCellAttrProvider, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -6820,7 +6756,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *, PyObje } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetColAttr(arg2,arg3); + (arg1)->SetColAttr(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8292,7 +8228,7 @@ static PyObject *_wrap_PyGridTableBase_Destroy(PyObject *, PyObject *args, PyObj } -static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_GetTypeName(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8305,7 +8241,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *, PyObject *ar (char *) "self",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8318,7 +8254,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetTypeName(arg2,arg3); + result = (arg1)->GetTypeName(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8336,7 +8272,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *, PyObject *ar } -static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_CanGetValueAs(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8352,7 +8288,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *, PyObject * (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8370,7 +8306,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_CanGetValueAs(arg2,arg3,(wxString const &)*arg4); + result = (bool)(arg1)->CanGetValueAs(arg2,arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8392,7 +8328,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *, PyObject * } -static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_CanSetValueAs(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8408,7 +8344,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *, PyObject * (char *) "self",(char *) "row",(char *) "col",(char *) "typeName", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8426,7 +8362,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_CanSetValueAs(arg2,arg3,(wxString const &)*arg4); + result = (bool)(arg1)->CanSetValueAs(arg2,arg3,(wxString const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8448,7 +8384,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *, PyObject * } -static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_Clear(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; PyObject * obj0 = 0 ; @@ -8456,12 +8392,12 @@ static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridTableBase_base_Clear",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridTableBase_Clear",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_Clear(); + (arg1)->Clear(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8473,7 +8409,7 @@ static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_InsertRows(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 0 ; @@ -8486,7 +8422,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *, PyObject *arg (char *) "self",(char *) "pos",(char *) "numRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_base_InsertRows",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_InsertRows",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8503,7 +8439,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_InsertRows(arg2,arg3); + result = (bool)(arg1)->InsertRows(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8517,7 +8453,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_AppendRows(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 1 ; @@ -8528,7 +8464,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *, PyObject *arg (char *) "self",(char *) "numRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyGridTableBase_base_AppendRows",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyGridTableBase_AppendRows",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8539,7 +8475,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_AppendRows(arg2); + result = (bool)(arg1)->AppendRows(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8553,7 +8489,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_DeleteRows(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 0 ; @@ -8566,7 +8502,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *, PyObject *arg (char *) "self",(char *) "pos",(char *) "numRows", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_base_DeleteRows",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_DeleteRows",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8583,7 +8519,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_DeleteRows(arg2,arg3); + result = (bool)(arg1)->DeleteRows(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8597,7 +8533,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_InsertCols(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 0 ; @@ -8610,7 +8546,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *, PyObject *arg (char *) "self",(char *) "pos",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_base_InsertCols",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_InsertCols",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8627,7 +8563,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_InsertCols(arg2,arg3); + result = (bool)(arg1)->InsertCols(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8641,7 +8577,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_AppendCols(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 1 ; @@ -8652,7 +8588,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *, PyObject *arg (char *) "self",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyGridTableBase_base_AppendCols",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:PyGridTableBase_AppendCols",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8663,7 +8599,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_AppendCols(arg2); + result = (bool)(arg1)->AppendCols(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8677,7 +8613,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_DeleteCols(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; size_t arg2 = (size_t) 0 ; @@ -8690,7 +8626,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *, PyObject *arg (char *) "self",(char *) "pos",(char *) "numCols", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_base_DeleteCols",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:PyGridTableBase_DeleteCols",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { @@ -8707,7 +8643,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_DeleteCols(arg2,arg3); + result = (bool)(arg1)->DeleteCols(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8721,7 +8657,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_GetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8732,7 +8668,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *, PyObjec (char *) "self",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8741,7 +8677,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetRowLabelValue(arg2); + result = (arg1)->GetRowLabelValue(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8759,7 +8695,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *, PyObjec } -static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_GetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8770,7 +8706,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *, PyObjec (char *) "self",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8779,7 +8715,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->base_GetColLabelValue(arg2); + result = (arg1)->GetColLabelValue(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8797,7 +8733,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *, PyObjec } -static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_SetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8810,7 +8746,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *, PyObjec (char *) "self",(char *) "row",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8824,7 +8760,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetRowLabelValue(arg2,(wxString const &)*arg3); + (arg1)->SetRowLabelValue(arg2,(wxString const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8844,7 +8780,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *, PyObjec } -static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_SetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8857,7 +8793,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *, PyObjec (char *) "self",(char *) "col",(char *) "value", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8871,7 +8807,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *, PyObjec } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetColLabelValue(arg2,(wxString const &)*arg3); + (arg1)->SetColLabelValue(arg2,(wxString const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8891,7 +8827,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *, PyObjec } -static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_CanHaveAttributes(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; bool result; @@ -8900,12 +8836,12 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridTableBase_base_CanHaveAttributes",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyGridTableBase_CanHaveAttributes",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_CanHaveAttributes(); + result = (bool)(arg1)->CanHaveAttributes(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8919,7 +8855,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *, PyObje } -static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; int arg2 ; @@ -8934,7 +8870,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, (char *) "self",(char *) "row",(char *) "col",(char *) "kind", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8951,7 +8887,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGridCellAttr *)(arg1)->base_GetAttr(arg2,arg3,arg4); + result = (wxGridCellAttr *)(arg1)->GetAttr(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8965,7 +8901,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, } -static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -8979,7 +8915,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *, PyObject *args, (char *) "self",(char *) "attr",(char *) "row",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -8994,7 +8930,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetAttr(arg2,arg3,arg4); + (arg1)->SetAttr(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9006,7 +8942,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *, PyObject *args, } -static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -9018,7 +8954,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *, PyObject *arg (char *) "self",(char *) "attr",(char *) "row", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -9029,7 +8965,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetRowAttr(arg2,arg3); + (arg1)->SetRowAttr(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9041,7 +8977,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *, PyObject *arg } -static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyGridTableBase_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ; wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ; @@ -9053,7 +8989,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *, PyObject *arg (char *) "self",(char *) "attr",(char *) "col", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyGridTableBase, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGridCellAttr, SWIG_POINTER_EXCEPTION | 0); @@ -9064,7 +9000,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *, PyObject *arg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_SetColAttr(arg2,arg3); + (arg1)->SetColAttr(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18131,7 +18067,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellRenderer_swigregister", GridCellRenderer_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyGridCellRenderer", (PyCFunction) _wrap_new_PyGridCellRenderer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellRenderer__setCallbackInfo", (PyCFunction) _wrap_PyGridCellRenderer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellRenderer_base_SetParameters", (PyCFunction) _wrap_PyGridCellRenderer_base_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellRenderer_SetParameters", (PyCFunction) _wrap_PyGridCellRenderer_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellRenderer_swigregister", PyGridCellRenderer_swigregister, METH_VARARGS, NULL}, { (char *)"new_GridCellStringRenderer", (PyCFunction) _wrap_new_GridCellStringRenderer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GridCellStringRenderer_swigregister", GridCellStringRenderer_swigregister, METH_VARARGS, NULL}, @@ -18176,15 +18112,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellEditor_swigregister", GridCellEditor_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyGridCellEditor", (PyCFunction) _wrap_new_PyGridCellEditor, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellEditor__setCallbackInfo", (PyCFunction) _wrap_PyGridCellEditor__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_SetSize", (PyCFunction) _wrap_PyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_Show", (PyCFunction) _wrap_PyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_PyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_IsAcceptedKey", (PyCFunction) _wrap_PyGridCellEditor_base_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_StartingKey", (PyCFunction) _wrap_PyGridCellEditor_base_StartingKey, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_StartingClick", (PyCFunction) _wrap_PyGridCellEditor_base_StartingClick, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_HandleReturn", (PyCFunction) _wrap_PyGridCellEditor_base_HandleReturn, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_Destroy", (PyCFunction) _wrap_PyGridCellEditor_base_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellEditor_base_SetParameters", (PyCFunction) _wrap_PyGridCellEditor_base_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_SetSize", (PyCFunction) _wrap_PyGridCellEditor_SetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_Show", (PyCFunction) _wrap_PyGridCellEditor_Show, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_PaintBackground", (PyCFunction) _wrap_PyGridCellEditor_PaintBackground, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_IsAcceptedKey", (PyCFunction) _wrap_PyGridCellEditor_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_StartingKey", (PyCFunction) _wrap_PyGridCellEditor_StartingKey, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_StartingClick", (PyCFunction) _wrap_PyGridCellEditor_StartingClick, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_HandleReturn", (PyCFunction) _wrap_PyGridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_Destroy", (PyCFunction) _wrap_PyGridCellEditor_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellEditor_SetParameters", (PyCFunction) _wrap_PyGridCellEditor_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellEditor_swigregister", PyGridCellEditor_swigregister, METH_VARARGS, NULL}, { (char *)"new_GridCellTextEditor", (PyCFunction) _wrap_new_GridCellTextEditor, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GridCellTextEditor_GetValue", (PyCFunction) _wrap_GridCellTextEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -18254,10 +18190,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellAttrProvider_swigregister", GridCellAttrProvider_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyGridCellAttrProvider", (PyCFunction) _wrap_new_PyGridCellAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellAttrProvider__setCallbackInfo", (PyCFunction) _wrap_PyGridCellAttrProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellAttrProvider_base_GetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellAttrProvider_base_SetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellAttrProvider_base_SetRowAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridCellAttrProvider_base_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellAttrProvider_GetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellAttrProvider_SetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellAttrProvider_SetRowAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL}, { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -18298,25 +18234,25 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PyGridTableBase", (PyCFunction) _wrap_new_PyGridTableBase, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridTableBase__setCallbackInfo", (PyCFunction) _wrap_PyGridTableBase__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridTableBase_Destroy", (PyCFunction) _wrap_PyGridTableBase_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_GetTypeName", (PyCFunction) _wrap_PyGridTableBase_base_GetTypeName, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_CanGetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanGetValueAs, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_CanSetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanSetValueAs, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_Clear", (PyCFunction) _wrap_PyGridTableBase_base_Clear, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_InsertRows", (PyCFunction) _wrap_PyGridTableBase_base_InsertRows, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_AppendRows", (PyCFunction) _wrap_PyGridTableBase_base_AppendRows, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_DeleteRows", (PyCFunction) _wrap_PyGridTableBase_base_DeleteRows, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_InsertCols", (PyCFunction) _wrap_PyGridTableBase_base_InsertCols, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_AppendCols", (PyCFunction) _wrap_PyGridTableBase_base_AppendCols, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_DeleteCols", (PyCFunction) _wrap_PyGridTableBase_base_DeleteCols, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_GetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_GetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_SetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_SetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_CanHaveAttributes", (PyCFunction) _wrap_PyGridTableBase_base_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_GetAttr", (PyCFunction) _wrap_PyGridTableBase_base_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_SetAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_SetRowAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyGridTableBase_base_SetColAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_GetTypeName", (PyCFunction) _wrap_PyGridTableBase_GetTypeName, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_CanGetValueAs", (PyCFunction) _wrap_PyGridTableBase_CanGetValueAs, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_CanSetValueAs", (PyCFunction) _wrap_PyGridTableBase_CanSetValueAs, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_Clear", (PyCFunction) _wrap_PyGridTableBase_Clear, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_InsertRows", (PyCFunction) _wrap_PyGridTableBase_InsertRows, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_AppendRows", (PyCFunction) _wrap_PyGridTableBase_AppendRows, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_DeleteRows", (PyCFunction) _wrap_PyGridTableBase_DeleteRows, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_InsertCols", (PyCFunction) _wrap_PyGridTableBase_InsertCols, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_AppendCols", (PyCFunction) _wrap_PyGridTableBase_AppendCols, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_DeleteCols", (PyCFunction) _wrap_PyGridTableBase_DeleteCols, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_GetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_GetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_GetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_SetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_SetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_SetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_CanHaveAttributes", (PyCFunction) _wrap_PyGridTableBase_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_GetAttr", (PyCFunction) _wrap_PyGridTableBase_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_SetAttr", (PyCFunction) _wrap_PyGridTableBase_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_SetRowAttr", (PyCFunction) _wrap_PyGridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyGridTableBase_SetColAttr", (PyCFunction) _wrap_PyGridTableBase_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyGridTableBase_swigregister", PyGridTableBase_swigregister, METH_VARARGS, NULL}, { (char *)"new_GridStringTable", (PyCFunction) _wrap_new_GridStringTable, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GridStringTable_swigregister", GridStringTable_swigregister, METH_VARARGS, NULL}, diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py index e73b2e983b..c1b7e69433 100644 --- a/wxPython/src/mac/html.py +++ b/wxPython/src/mac/html.py @@ -1160,21 +1160,41 @@ class HtmlWindow(_windows.ScrolledWindow): """ToText(self) -> String""" return _html.HtmlWindow_ToText(*args, **kwargs) - def base_OnLinkClicked(*args, **kwargs): - """base_OnLinkClicked(self, HtmlLinkInfo link)""" - return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs) - - def base_OnSetTitle(*args, **kwargs): - """base_OnSetTitle(self, String title)""" - return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs) - - def base_OnCellMouseHover(*args, **kwargs): - """base_OnCellMouseHover(self, HtmlCell cell, int x, int y)""" - return _html.HtmlWindow_base_OnCellMouseHover(*args, **kwargs) - - def base_OnCellClicked(*args, **kwargs): - """base_OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)""" - return _html.HtmlWindow_base_OnCellClicked(*args, **kwargs) + def OnLinkClicked(*args, **kwargs): + """OnLinkClicked(self, HtmlLinkInfo link)""" + return _html.HtmlWindow_OnLinkClicked(*args, **kwargs) + + def OnSetTitle(*args, **kwargs): + """OnSetTitle(self, String title)""" + return _html.HtmlWindow_OnSetTitle(*args, **kwargs) + + def OnCellMouseHover(*args, **kwargs): + """OnCellMouseHover(self, HtmlCell cell, int x, int y)""" + return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs) + + def OnCellClicked(*args, **kwargs): + """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)""" + return _html.HtmlWindow_OnCellClicked(*args, **kwargs) + + def base_OnLinkClicked(*args, **kw): + return HtmlWindow.OnLinkClicked(*args, **kw) + base_OnLinkClicked = wx._deprecated(base_OnLinkClicked, + "Please use HtmlWindow.OnLinkClicked instead.") + + def base_OnSetTitle(*args, **kw): + return HtmlWindow.OnSetTitle(*args, **kw) + base_OnSetTitle = wx._deprecated(base_OnSetTitle, + "Please use HtmlWindow.OnSetTitle instead.") + + def base_OnCellMouseHover(*args, **kw): + return HtmlWindow.OnCellMouseHover(*args, **kw) + base_OnCellMouseHover = wx._deprecated(base_OnCellMouseHover, + "Please use HtmlWindow.OnCellMouseHover instead.") + + def base_OnCellClicked(*args, **kw): + return HtmlWindow.OnCellClicked(*args, **kw) + base_OnCellClicked = wx._deprecated(base_OnCellClicked, + "Please use HtmlWindow.OnCellClicked instead.") def GetClassDefaultAttributes(*args, **kwargs): """ diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index 6eef6a02b6..7aad3b7b6d 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -2119,7 +2119,7 @@ public: } void OnLinkClicked(const wxHtmlLinkInfo& link); - void base_OnLinkClicked(const wxHtmlLinkInfo& link); +//- void base_OnLinkClicked(const wxHtmlLinkInfo& link); wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type, const wxString& url, @@ -2149,9 +2149,9 @@ void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { if (! found) wxHtmlWindow::OnLinkClicked(link); } -void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) { - wxHtmlWindow::OnLinkClicked(link); -} +// void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) { +// wxHtmlWindow::OnLinkClicked(link); +// } wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type, @@ -8858,7 +8858,7 @@ static PyObject *_wrap_HtmlWindow_ToText(PyObject *, PyObject *args, PyObject *k } -static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlLinkInfo *arg2 = 0 ; @@ -8868,7 +8868,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, (char *) "self",(char *) "link", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_base_OnLinkClicked",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_OnLinkClicked",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8881,7 +8881,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnLinkClicked((wxHtmlLinkInfo const &)*arg2); + (arg1)->OnLinkClicked((wxHtmlLinkInfo const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8893,7 +8893,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, } -static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; @@ -8904,7 +8904,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py (char *) "self",(char *) "title", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_base_OnSetTitle",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_OnSetTitle",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -8914,7 +8914,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnSetTitle((wxString const &)*arg2); + (arg1)->OnSetTitle((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8934,7 +8934,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, Py } -static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; @@ -8948,7 +8948,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar (char *) "self",(char *) "cell",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_base_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_OnCellMouseHover",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlCell, SWIG_POINTER_EXCEPTION | 0); @@ -8963,7 +8963,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnCellMouseHover(arg2,arg3,arg4); + (arg1)->OnCellMouseHover(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -8975,7 +8975,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *ar } -static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxHtmlCell *arg2 = (wxHtmlCell *) 0 ; @@ -8991,7 +8991,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, (char *) "self",(char *) "cell",(char *) "x",(char *) "y",(char *) "event", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_base_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:HtmlWindow_OnCellClicked",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlCell, SWIG_POINTER_EXCEPTION | 0); @@ -9014,7 +9014,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5); + (arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14755,10 +14755,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/wizard.py b/wxPython/src/mac/wizard.py index 3363179f5a..118f99430f 100644 --- a/wxPython/src/mac/wizard.py +++ b/wxPython/src/mac/wizard.py @@ -143,77 +143,250 @@ class PyWizardPage(WizardPage): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _wizard.PyWizardPage__setCallbackInfo(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _wizard.PyWizardPage_base_DoMoveWindow(*args, **kwargs) + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _wizard.PyWizardPage_DoMoveWindow(*args, **kwargs) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _wizard.PyWizardPage_base_DoSetSize(*args, **kwargs) + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _wizard.PyWizardPage_DoSetSize(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _wizard.PyWizardPage_base_DoSetClientSize(*args, **kwargs) + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _wizard.PyWizardPage_DoSetClientSize(*args, **kwargs) - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _wizard.PyWizardPage_base_DoSetVirtualSize(*args, **kwargs) + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _wizard.PyWizardPage_DoSetVirtualSize(*args, **kwargs) - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _wizard.PyWizardPage_base_DoGetSize(*args, **kwargs) + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _wizard.PyWizardPage_DoGetSize(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _wizard.PyWizardPage_base_DoGetClientSize(*args, **kwargs) + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _wizard.PyWizardPage_DoGetClientSize(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _wizard.PyWizardPage_base_DoGetPosition(*args, **kwargs) + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _wizard.PyWizardPage_DoGetPosition(*args, **kwargs) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _wizard.PyWizardPage_base_DoGetVirtualSize(*args, **kwargs) + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _wizard.PyWizardPage_DoGetVirtualSize(*args, **kwargs) - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _wizard.PyWizardPage_base_DoGetBestSize(*args, **kwargs) + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _wizard.PyWizardPage_DoGetBestSize(*args, **kwargs) - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _wizard.PyWizardPage_base_InitDialog(*args, **kwargs) + def InitDialog(*args, **kwargs): + """ + InitDialog(self) - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _wizard.PyWizardPage_base_TransferDataToWindow(*args, **kwargs) + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _wizard.PyWizardPage_InitDialog(*args, **kwargs) - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _wizard.PyWizardPage_base_TransferDataFromWindow(*args, **kwargs) + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _wizard.PyWizardPage_base_Validate(*args, **kwargs) + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _wizard.PyWizardPage_TransferDataToWindow(*args, **kwargs) - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _wizard.PyWizardPage_base_AcceptsFocus(*args, **kwargs) + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _wizard.PyWizardPage_base_AcceptsFocusFromKeyboard(*args, **kwargs) + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _wizard.PyWizardPage_TransferDataFromWindow(*args, **kwargs) - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _wizard.PyWizardPage_base_GetMaxSize(*args, **kwargs) + def Validate(*args, **kwargs): + """ + Validate(self) -> bool - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _wizard.PyWizardPage_base_AddChild(*args, **kwargs) + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _wizard.PyWizardPage_Validate(*args, **kwargs) - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _wizard.PyWizardPage_base_RemoveChild(*args, **kwargs) + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _wizard.PyWizardPage_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool + + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _wizard.PyWizardPage_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _wizard.PyWizardPage_GetMaxSize(*args, **kwargs) + + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) + + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _wizard.PyWizardPage_AddChild(*args, **kwargs) + + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) + + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _wizard.PyWizardPage_RemoveChild(*args, **kwargs) + + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool + + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. + + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _wizard.PyWizardPage_ShouldInheritColours(*args, **kwargs) + + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _wizard.PyWizardPage_GetDefaultAttributes(*args, **kwargs) + + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _wizard.PyWizardPage_OnInternalIdle(*args, **kwargs) + + def base_DoMoveWindow(*args, **kw): + return PyWizardPage.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyWizardPage.DoMoveWindow instead.") + + def base_DoSetSize(*args, **kw): + return PyWizardPage.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyWizardPage.DoSetSize instead.") + + def base_DoSetClientSize(*args, **kw): + return PyWizardPage.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyWizardPage.DoSetClientSize instead.") + + def base_DoSetVirtualSize(*args, **kw): + return PyWizardPage.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyWizardPage.DoSetVirtualSize instead.") + + def base_DoGetSize(*args, **kw): + return PyWizardPage.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyWizardPage.DoGetSize instead.") + + def base_DoGetClientSize(*args, **kw): + return PyWizardPage.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyWizardPage.DoGetClientSize instead.") + + def base_DoGetPosition(*args, **kw): + return PyWizardPage.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyWizardPage.DoGetPosition instead.") + + def base_DoGetVirtualSize(*args, **kw): + return PyWizardPage.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyWizardPage.DoGetVirtualSize instead.") + + def base_DoGetBestSize(*args, **kw): + return PyWizardPage.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyWizardPage.DoGetBestSize instead.") + + def base_InitDialog(*args, **kw): + return PyWizardPage.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyWizardPage.InitDialog instead.") + + def base_TransferDataToWindow(*args, **kw): + return PyWizardPage.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyWizardPage.TransferDataToWindow instead.") + + def base_TransferDataFromWindow(*args, **kw): + return PyWizardPage.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyWizardPage.TransferDataFromWindow instead.") + + def base_Validate(*args, **kw): + return PyWizardPage.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyWizardPage.Validate instead.") + + def base_AcceptsFocus(*args, **kw): + return PyWizardPage.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyWizardPage.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyWizardPage.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyWizardPage.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyWizardPage.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyWizardPage.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyWizardPage.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyWizardPage.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyWizardPage.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyWizardPage.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyWizardPage.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyWizardPage.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyWizardPage.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyWizardPage.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyWizardPage.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyWizardPage.OnInternalIdle instead.") class PyWizardPagePtr(PyWizardPage): diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp index 6b216b1cf0..9974099896 100644 --- a/wxPython/src/mac/wizard_wrap.cpp +++ b/wxPython/src/mac/wizard_wrap.cpp @@ -1578,19 +1578,20 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxTopLevelWindow swig_types[143] #define SWIGTYPE_p_wxUpdateUIEvent swig_types[144] #define SWIGTYPE_p_wxValidator swig_types[145] -#define SWIGTYPE_p_wxWindow swig_types[146] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[147] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[148] -#define SWIGTYPE_p_wxWizard swig_types[149] -#define SWIGTYPE_p_wxWizardEvent swig_types[150] -#define SWIGTYPE_p_wxWizardPage swig_types[151] -#define SWIGTYPE_p_wxWizardPageSimple swig_types[152] -#define SWIGTYPE_p_wxXPMHandler swig_types[153] -#define SWIGTYPE_ptrdiff_t swig_types[154] -#define SWIGTYPE_std__ptrdiff_t swig_types[155] -#define SWIGTYPE_unsigned_int swig_types[156] -static swig_type_info *swig_types[158]; -static swig_module_info swig_module = {swig_types, 157, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxVisualAttributes swig_types[146] +#define SWIGTYPE_p_wxWindow swig_types[147] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[148] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[149] +#define SWIGTYPE_p_wxWizard swig_types[150] +#define SWIGTYPE_p_wxWizardEvent swig_types[151] +#define SWIGTYPE_p_wxWizardPage swig_types[152] +#define SWIGTYPE_p_wxWizardPageSimple swig_types[153] +#define SWIGTYPE_p_wxXPMHandler swig_types[154] +#define SWIGTYPE_ptrdiff_t swig_types[155] +#define SWIGTYPE_std__ptrdiff_t swig_types[156] +#define SWIGTYPE_unsigned_int swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2337,7 +2338,7 @@ static PyObject *_wrap_PyWizardPage__setCallbackInfo(PyObject *, PyObject *args, } -static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int arg2 ; @@ -2353,7 +2354,7 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *, PyObject *args (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWizardPage_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -2374,7 +2375,7 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *, PyObject *args } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoMoveWindow(arg2,arg3,arg4,arg5); + (arg1)->DoMoveWindow(arg2,arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2386,7 +2387,7 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *, PyObject *args } -static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int arg2 ; @@ -2404,7 +2405,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *, PyObject *args, P (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height",(char *) "sizeFlags", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWizardPage_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWizardPage_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -2431,7 +2432,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *, PyObject *args, P } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetSize(arg2,arg3,arg4,arg5,arg6); + (arg1)->DoSetSize(arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2443,7 +2444,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int arg2 ; @@ -2455,7 +2456,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *, PyObject *a (char *) "self",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -2468,7 +2469,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *, PyObject *a } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetClientSize(arg2,arg3); + (arg1)->DoSetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2480,7 +2481,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *, PyObject *a } -static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int arg2 ; @@ -2492,7 +2493,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *, PyObject * (char *) "self",(char *) "x",(char *) "y", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -2505,7 +2506,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *, PyObject * } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_DoSetVirtualSize(arg2,arg3); + (arg1)->DoSetVirtualSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2517,7 +2518,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *, PyObject * } -static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int *arg2 = (int *) 0 ; @@ -2533,12 +2534,12 @@ static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *, PyObject *args, P arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_DoGetSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWizardPage const *)arg1)->base_DoGetSize(arg2,arg3); + ((wxPyWizardPage const *)arg1)->DoGetSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2554,7 +2555,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *, PyObject *args, P } -static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int *arg2 = (int *) 0 ; @@ -2570,12 +2571,12 @@ static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *, PyObject *a arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetClientSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_DoGetClientSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWizardPage const *)arg1)->base_DoGetClientSize(arg2,arg3); + ((wxPyWizardPage const *)arg1)->DoGetClientSize(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2591,7 +2592,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *, PyObject *a } -static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; int *arg2 = (int *) 0 ; @@ -2607,12 +2608,12 @@ static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *, PyObject *arg arg2 = &temp2; res2 = SWIG_NEWOBJ; arg3 = &temp3; res3 = SWIG_NEWOBJ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetPosition",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_DoGetPosition",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - ((wxPyWizardPage const *)arg1)->base_DoGetPosition(arg2,arg3); + ((wxPyWizardPage const *)arg1)->DoGetPosition(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2628,7 +2629,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *, PyObject *arg } -static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; wxSize result; @@ -2637,12 +2638,12 @@ static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetVirtualSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_DoGetVirtualSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWizardPage const *)arg1)->base_DoGetVirtualSize(); + result = ((wxPyWizardPage const *)arg1)->DoGetVirtualSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2658,7 +2659,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *, PyObject * } -static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; wxSize result; @@ -2667,12 +2668,12 @@ static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *, PyObject *arg (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetBestSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_DoGetBestSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWizardPage const *)arg1)->base_DoGetBestSize(); + result = ((wxPyWizardPage const *)arg1)->DoGetBestSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2688,7 +2689,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *, PyObject *arg } -static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; PyObject * obj0 = 0 ; @@ -2696,12 +2697,12 @@ static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_InitDialog",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_InitDialog",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_InitDialog(); + (arg1)->InitDialog(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2713,7 +2714,7 @@ static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *, PyObject *args, } -static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; bool result; @@ -2722,12 +2723,12 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_TransferDataToWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_TransferDataToWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataToWindow(); + result = (bool)(arg1)->TransferDataToWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2741,7 +2742,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *, PyObje } -static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; bool result; @@ -2750,12 +2751,12 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *, PyOb (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_TransferDataFromWindow",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_TransferDataFromWindow",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_TransferDataFromWindow(); + result = (bool)(arg1)->TransferDataFromWindow(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2769,7 +2770,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *, PyOb } -static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_Validate(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; bool result; @@ -2778,12 +2779,12 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_Validate",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_Validate",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->base_Validate(); + result = (bool)(arg1)->Validate(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2797,7 +2798,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; bool result; @@ -2806,12 +2807,12 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *, PyObject *args (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_AcceptsFocus",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_AcceptsFocus",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyWizardPage const *)arg1)->base_AcceptsFocus(); + result = (bool)((wxPyWizardPage const *)arg1)->AcceptsFocus(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2825,7 +2826,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *, PyObject *args } -static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; bool result; @@ -2834,12 +2835,12 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_AcceptsFocusFromKeyboard",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPyWizardPage const *)arg1)->base_AcceptsFocusFromKeyboard(); + result = (bool)((wxPyWizardPage const *)arg1)->AcceptsFocusFromKeyboard(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2853,7 +2854,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *, Py } -static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; wxSize result; @@ -2862,12 +2863,12 @@ static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *, PyObject *args, (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_GetMaxSize",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_GetMaxSize",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxPyWizardPage const *)arg1)->base_GetMaxSize(); + result = ((wxPyWizardPage const *)arg1)->GetMaxSize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2883,7 +2884,7 @@ static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *, PyObject *args, } -static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_AddChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -2893,14 +2894,14 @@ static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *, PyObject *args, Py (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWizardPage_base_AddChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWizardPage_AddChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_AddChild(arg2); + (arg1)->AddChild(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2912,7 +2913,7 @@ static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *, PyObject *args, Py } -static PyObject *_wrap_PyWizardPage_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyWizardPage_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -2922,14 +2923,97 @@ static PyObject *_wrap_PyWizardPage_base_RemoveChild(PyObject *, PyObject *args, (char *) "self",(char *) "child", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWizardPage_base_RemoveChild",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyWizardPage_RemoveChild",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->base_RemoveChild(arg2); + (arg1)->RemoveChild(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PyWizardPage_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_ShouldInheritColours",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxPyWizardPage const *)arg1)->ShouldInheritColours(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PyWizardPage_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_GetDefaultAttributes",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetDefaultAttributes(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes(static_cast(result)); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PyWizardPage_OnInternalIdle(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_OnInternalIdle",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyWizardPage, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->OnInternalIdle(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3766,24 +3850,27 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PrePyWizardPage", (PyCFunction) _wrap_new_PrePyWizardPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWizardPage_Create", (PyCFunction) _wrap_PyWizardPage_Create, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWizardPage__setCallbackInfo", (PyCFunction) _wrap_PyWizardPage__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoMoveWindow", (PyCFunction) _wrap_PyWizardPage_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoSetSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoSetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoGetSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoGetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoGetPosition", (PyCFunction) _wrap_PyWizardPage_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_DoGetBestSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_InitDialog", (PyCFunction) _wrap_PyWizardPage_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_TransferDataToWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_Validate", (PyCFunction) _wrap_PyWizardPage_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_AcceptsFocus", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_GetMaxSize", (PyCFunction) _wrap_PyWizardPage_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_AddChild", (PyCFunction) _wrap_PyWizardPage_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyWizardPage_base_RemoveChild", (PyCFunction) _wrap_PyWizardPage_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoMoveWindow", (PyCFunction) _wrap_PyWizardPage_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoSetSize", (PyCFunction) _wrap_PyWizardPage_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoSetClientSize", (PyCFunction) _wrap_PyWizardPage_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoSetVirtualSize", (PyCFunction) _wrap_PyWizardPage_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoGetSize", (PyCFunction) _wrap_PyWizardPage_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoGetClientSize", (PyCFunction) _wrap_PyWizardPage_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoGetPosition", (PyCFunction) _wrap_PyWizardPage_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoGetVirtualSize", (PyCFunction) _wrap_PyWizardPage_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_DoGetBestSize", (PyCFunction) _wrap_PyWizardPage_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_InitDialog", (PyCFunction) _wrap_PyWizardPage_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_TransferDataToWindow", (PyCFunction) _wrap_PyWizardPage_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_TransferDataFromWindow", (PyCFunction) _wrap_PyWizardPage_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_Validate", (PyCFunction) _wrap_PyWizardPage_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_AcceptsFocus", (PyCFunction) _wrap_PyWizardPage_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWizardPage_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_GetMaxSize", (PyCFunction) _wrap_PyWizardPage_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_AddChild", (PyCFunction) _wrap_PyWizardPage_AddChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_RemoveChild", (PyCFunction) _wrap_PyWizardPage_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_ShouldInheritColours", (PyCFunction) _wrap_PyWizardPage_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_GetDefaultAttributes", (PyCFunction) _wrap_PyWizardPage_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyWizardPage_OnInternalIdle", (PyCFunction) _wrap_PyWizardPage_OnInternalIdle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyWizardPage_swigregister", PyWizardPage_swigregister, METH_VARARGS, NULL}, { (char *)"new_WizardPageSimple", (PyCFunction) _wrap_new_WizardPageSimple, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreWizardPageSimple", (PyCFunction) _wrap_new_PreWizardPageSimple, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -4998,6 +5085,7 @@ static swig_type_info _swigt__p_wxPyWizardPage = {"_p_wxPyWizardPage", "wxPyWiza static swig_type_info _swigt__p_wxSize = {"_p_wxSize", "wxSize *", 0, 0, 0}; static swig_type_info _swigt__p_wxString = {"_p_wxString", "wxString *", 0, 0, 0}; static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", "wxTopLevelWindow *", 0, 0, 0}; +static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, 0}; static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, 0}; static swig_type_info _swigt__p_wxWizard = {"_p_wxWizard", "wxWizard *", 0, 0, 0}; static swig_type_info _swigt__p_wxWizardEvent = {"_p_wxWizardEvent", "wxWizardEvent *", 0, 0, 0}; @@ -5154,6 +5242,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxTopLevelWindow, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, + &_swigt__p_wxVisualAttributes, &_swigt__p_wxWindow, &_swigt__p_wxWindowCreateEvent, &_swigt__p_wxWindowDestroyEvent, @@ -5316,6 +5405,7 @@ static swig_cast_info _swigc__p_wxPyWizardPage[] = { {&_swigt__p_wxPyWizardPage static swig_cast_info _swigc__p_wxSize[] = { {&_swigt__p_wxSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxString[] = { {&_swigt__p_wxString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTopLevelWindow[] = { {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, 0, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxWizard, _p_wxWizardTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxTopLevelWindow, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxTopLevelWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxVisualAttributes[] = { {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxWizardPage, _p_wxWizardPageTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWizardPage, _p_wxPyWizardPageTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWizard, _p_wxWizardTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWizardPageSimple, _p_wxWizardPageSimpleTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWizard[] = { {&_swigt__p_wxWizard, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWizardEvent[] = { {&_swigt__p_wxWizardEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -5472,6 +5562,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxTopLevelWindow, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, + _swigc__p_wxVisualAttributes, _swigc__p_wxWindow, _swigc__p_wxWindowCreateEvent, _swigc__p_wxWindowDestroyEvent, -- 2.45.2