From d93d8a12ef975988b85a0dde8d93a80505690c85 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 26 Jan 2007 16:37:40 +0000 Subject: [PATCH] Added some missing "private:" keywords git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/aui.i | 4 ++++ wxPython/src/gtk/aui.py | 12 +++++++++++- wxPython/src/gtk/aui_wrap.cpp | 26 ++++++++++++++++++++++++++ wxPython/src/mac/aui.py | 12 +++++++++++- wxPython/src/mac/aui_wrap.cpp | 26 ++++++++++++++++++++++++++ wxPython/src/msw/aui.py | 12 +++++++++++- wxPython/src/msw/aui_wrap.cpp | 26 ++++++++++++++++++++++++++ 7 files changed, 115 insertions(+), 3 deletions(-) diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index a5b3ff5f00..1609c74f52 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -306,6 +306,7 @@ The following example shows a simple implementation that utilizes // A wxDocArt class that knows how to forward virtuals to Python methods class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: wxPyAuiDockArt() : wxAuiDefaultDockArt() {} DEC_PYCALLBACK_INT_INT(GetMetric); @@ -479,6 +480,7 @@ methods to the Python methods implemented in the derived class.", ""); class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: %pythonAppend wxPyAuiDockArt setCallbackInfo(PyAuiDockArt) wxPyAuiDocArt(); @@ -527,6 +529,7 @@ class wxPyAuiDockArt : public wxAuiDefaultDockArt // A wxTabArt class that knows how to forward virtuals to Python methods class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: wxPyAuiTabArt() : wxAuiDefaultTabArt() {} @@ -734,6 +737,7 @@ methods to the Python methods implemented in the derived class.", ""); class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: %pythonAppend wxPyAuiTabArt setCallbackInfo(PyAuiTabArt) wxPyAuiTabArt(); diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 6e572081bf..6c0cacb656 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -1730,8 +1730,18 @@ class PyAuiTabArt(AuiDefaultTabArt): methods to the Python methods implemented in the derived class. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> PyAuiTabArt + + This version of the `TabArt` class has been instrumented to be + subclassable in Python and to reflect all calls to the C++ base class + methods to the Python methods implemented in the derived class. + """ + _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) + PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 7e14284be8..3e09be45d0 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -2929,6 +2929,7 @@ SWIG_From_size_t (size_t value) // A wxDocArt class that knows how to forward virtuals to Python methods class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: wxPyAuiDockArt() : wxAuiDefaultDockArt() {} DEC_PYCALLBACK_INT_INT(GetMetric); @@ -3097,6 +3098,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour); // A wxTabArt class that knows how to forward virtuals to Python methods class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: wxPyAuiTabArt() : wxAuiDefaultTabArt() {} @@ -18150,6 +18152,24 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPyAuiTabArt *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPyAuiTabArt *)new wxPyAuiTabArt(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18157,6 +18177,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py return SWIG_Py_Void(); } +SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + static PyMethodDef SwigMethods[] = { { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL}, { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL}, @@ -18590,7 +18614,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, + { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL}, + { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } }; diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 6e572081bf..6c0cacb656 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -1730,8 +1730,18 @@ class PyAuiTabArt(AuiDefaultTabArt): methods to the Python methods implemented in the derived class. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> PyAuiTabArt + + This version of the `TabArt` class has been instrumented to be + subclassable in Python and to reflect all calls to the C++ base class + methods to the Python methods implemented in the derived class. + """ + _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) + PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index bd580c6670..8529120e3f 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -2929,6 +2929,7 @@ SWIG_From_size_t (size_t value) // A wxDocArt class that knows how to forward virtuals to Python methods class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: wxPyAuiDockArt() : wxAuiDefaultDockArt() {} DEC_PYCALLBACK_INT_INT(GetMetric); @@ -3097,6 +3098,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour); // A wxTabArt class that knows how to forward virtuals to Python methods class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: wxPyAuiTabArt() : wxAuiDefaultTabArt() {} @@ -18150,6 +18152,24 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPyAuiTabArt *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPyAuiTabArt *)new wxPyAuiTabArt(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18157,6 +18177,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py return SWIG_Py_Void(); } +SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + static PyMethodDef SwigMethods[] = { { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL}, { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL}, @@ -18590,7 +18614,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, + { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL}, + { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } }; diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 6e572081bf..6c0cacb656 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -1730,8 +1730,18 @@ class PyAuiTabArt(AuiDefaultTabArt): methods to the Python methods implemented in the derived class. """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self) -> PyAuiTabArt + + This version of the `TabArt` class has been instrumented to be + subclassable in Python and to reflect all calls to the C++ base class + methods to the Python methods implemented in the derived class. + """ + _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) + PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 7e14284be8..3e09be45d0 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -2929,6 +2929,7 @@ SWIG_From_size_t (size_t value) // A wxDocArt class that knows how to forward virtuals to Python methods class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: wxPyAuiDockArt() : wxAuiDefaultDockArt() {} DEC_PYCALLBACK_INT_INT(GetMetric); @@ -3097,6 +3098,7 @@ IMP_PYCALLBACK__INTCOLOUR(wxPyAuiDockArt, wxAuiDefaultDockArt, SetColour); // A wxTabArt class that knows how to forward virtuals to Python methods class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: wxPyAuiTabArt() : wxAuiDefaultTabArt() {} @@ -18150,6 +18152,24 @@ SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), P return SWIG_Py_Void(); } +SWIGINTERN PyObject *_wrap_new_PyAuiTabArt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxPyAuiTabArt *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"new_PyAuiTabArt",0,0,0)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPyAuiTabArt *)new wxPyAuiTabArt(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyAuiTabArt, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18157,6 +18177,10 @@ SWIGINTERN PyObject *PyAuiTabArt_swigregister(PyObject *SWIGUNUSEDPARM(self), Py return SWIG_Py_Void(); } +SWIGINTERN PyObject *PyAuiTabArt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + static PyMethodDef SwigMethods[] = { { (char *)"new_AuiPaneInfo", (PyCFunction)_wrap_new_AuiPaneInfo, METH_NOARGS, NULL}, { (char *)"delete_AuiPaneInfo", (PyCFunction)_wrap_delete_AuiPaneInfo, METH_O, NULL}, @@ -18590,7 +18614,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, + { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, { (char *)"PyAuiTabArt_swigregister", PyAuiTabArt_swigregister, METH_VARARGS, NULL}, + { (char *)"PyAuiTabArt_swiginit", PyAuiTabArt_swiginit, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } };