From f35e2ab9edb99c93533d41914be1b789c18da7f2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 27 Apr 2007 18:24:08 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_core.py | 18 +++- wxPython/src/gtk/_core_wrap.cpp | 147 ++++++++------------------------ wxPython/src/gtk/_misc.py | 22 ++--- wxPython/src/gtk/aui.py | 8 ++ wxPython/src/gtk/aui_wrap.cpp | 74 +++++++++++++++- wxPython/src/gtk/grid_wrap.cpp | 2 +- wxPython/src/mac/_core.py | 18 +++- wxPython/src/mac/_core_wrap.cpp | 147 ++++++++------------------------ wxPython/src/mac/_misc.py | 22 ++--- wxPython/src/mac/aui.py | 8 ++ wxPython/src/mac/aui_wrap.cpp | 74 +++++++++++++++- wxPython/src/mac/grid_wrap.cpp | 2 +- wxPython/src/msw/_core.py | 18 +++- wxPython/src/msw/_core_wrap.cpp | 147 ++++++++------------------------ wxPython/src/msw/_misc.py | 22 ++--- wxPython/src/msw/aui.py | 8 ++ wxPython/src/msw/aui_wrap.cpp | 74 +++++++++++++++- wxPython/src/msw/grid_wrap.cpp | 2 +- 18 files changed, 429 insertions(+), 384 deletions(-) diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 2b8391d1e4..eb1a2be528 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -8113,9 +8113,21 @@ class VisualAttributes(object): _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs)) __swig_destroy__ = _core_.delete_VisualAttributes __del__ = lambda self : None; - font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set) - colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set) - colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set) + def _get_font(*args, **kwargs): + """_get_font(self) -> Font""" + return _core_.VisualAttributes__get_font(*args, **kwargs) + + def _get_colFg(*args, **kwargs): + """_get_colFg(self) -> Colour""" + return _core_.VisualAttributes__get_colFg(*args, **kwargs) + + def _get_colBg(*args, **kwargs): + """_get_colBg(self) -> Colour""" + return _core_.VisualAttributes__get_colBg(*args, **kwargs) + + font = property(_get_font) + colFg = property(_get_colFg) + colBg = property(_get_colBg) _core_.VisualAttributes_swigregister(VisualAttributes) NullAcceleratorTable = cvar.NullAcceleratorTable PanelNameStr = cvar.PanelNameStr diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 2f3d915f26..443bd36d07 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -3881,6 +3881,9 @@ public: static const wxString wxPyPanelNameStr(wxPanelNameStr); SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; } SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; } +SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; } +SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; } +SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; } SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){ wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list); @@ -32583,40 +32586,10 @@ fail: } -SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); - } - arg2 = reinterpret_cast< wxFont * >(argp2); - if (arg1) (arg1)->font = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *result = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32625,51 +32598,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxFont *)& ((arg1)->font); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_font(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colFg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32678,51 +32626,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colFg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colFg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colBg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32731,11 +32654,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colBg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colBg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; @@ -58369,12 +58297,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL}, { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL}, - { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL}, - { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL}, - { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL}, + { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL}, + { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL}, + { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL}, { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL}, { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL}, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 795fff7b49..c4f2fde510 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -4362,12 +4362,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) - Days = property(GetDays,doc="See `GetDays`") - Hours = property(GetHours,doc="See `GetHours`") - Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") - Minutes = property(GetMinutes,doc="See `GetMinutes`") - Seconds = property(GetSeconds,doc="See `GetSeconds`") - Weeks = property(GetWeeks,doc="See `GetWeeks`") + days = property(GetDays,doc="See `GetDays`") + hours = property(GetHours,doc="See `GetHours`") + milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + minutes = property(GetMinutes,doc="See `GetMinutes`") + seconds = property(GetSeconds,doc="See `GetSeconds`") + weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4559,11 +4559,11 @@ class DateSpan(object): """__ne__(self, DateSpan other) -> bool""" return _misc_.DateSpan___ne__(*args, **kwargs) - Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") - Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") - TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") - Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") - Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") + days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") + months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") + totalDays = property(GetTotalDays,doc="See `GetTotalDays`") + weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") + years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") _misc_.DateSpan_swigregister(DateSpan) def DateSpan_Days(*args, **kwargs): diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 13e292c270..0bb10cbacb 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -1731,6 +1731,10 @@ class PyAuiDockArt(AuiDefaultDockArt): _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs)) PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiDockArt_swigregister(PyAuiDockArt) class PyAuiTabArt(AuiDefaultTabArt): @@ -1752,6 +1756,10 @@ class PyAuiTabArt(AuiDefaultTabArt): _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 73199e9436..e5ff53d0de 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -3295,7 +3295,6 @@ public: DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); DEC_PYCALLBACK__FONT(SetMeasuringFont); -// DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize); PYPRIVATE; }; @@ -3304,7 +3303,6 @@ public: IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont); -//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize); #ifdef __cplusplus extern "C" { @@ -18178,6 +18176,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18207,6 +18240,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + 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; @@ -18651,9 +18719,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL}, + { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, + { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, 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/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index ff699cb5ce..474fc5f701 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -3445,7 +3445,7 @@ public: void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { + if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) { PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 2b8391d1e4..eb1a2be528 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -8113,9 +8113,21 @@ class VisualAttributes(object): _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs)) __swig_destroy__ = _core_.delete_VisualAttributes __del__ = lambda self : None; - font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set) - colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set) - colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set) + def _get_font(*args, **kwargs): + """_get_font(self) -> Font""" + return _core_.VisualAttributes__get_font(*args, **kwargs) + + def _get_colFg(*args, **kwargs): + """_get_colFg(self) -> Colour""" + return _core_.VisualAttributes__get_colFg(*args, **kwargs) + + def _get_colBg(*args, **kwargs): + """_get_colBg(self) -> Colour""" + return _core_.VisualAttributes__get_colBg(*args, **kwargs) + + font = property(_get_font) + colFg = property(_get_colFg) + colBg = property(_get_colBg) _core_.VisualAttributes_swigregister(VisualAttributes) NullAcceleratorTable = cvar.NullAcceleratorTable PanelNameStr = cvar.PanelNameStr diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 4dfe3dc4d5..9dc34b6ede 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -3881,6 +3881,9 @@ public: static const wxString wxPyPanelNameStr(wxPanelNameStr); SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; } SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; } +SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; } +SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; } +SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; } SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){ wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list); @@ -32582,40 +32585,10 @@ fail: } -SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); - } - arg2 = reinterpret_cast< wxFont * >(argp2); - if (arg1) (arg1)->font = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *result = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32624,51 +32597,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxFont *)& ((arg1)->font); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_font(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colFg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32677,51 +32625,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colFg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colFg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colBg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32730,11 +32653,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colBg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colBg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; @@ -58368,12 +58296,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL}, { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL}, - { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL}, - { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL}, - { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL}, + { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL}, + { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL}, + { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL}, { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL}, { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL}, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 6ac360873b..1bd6383b80 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -4362,12 +4362,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) - Days = property(GetDays,doc="See `GetDays`") - Hours = property(GetHours,doc="See `GetHours`") - Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") - Minutes = property(GetMinutes,doc="See `GetMinutes`") - Seconds = property(GetSeconds,doc="See `GetSeconds`") - Weeks = property(GetWeeks,doc="See `GetWeeks`") + days = property(GetDays,doc="See `GetDays`") + hours = property(GetHours,doc="See `GetHours`") + milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + minutes = property(GetMinutes,doc="See `GetMinutes`") + seconds = property(GetSeconds,doc="See `GetSeconds`") + weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4559,11 +4559,11 @@ class DateSpan(object): """__ne__(self, DateSpan other) -> bool""" return _misc_.DateSpan___ne__(*args, **kwargs) - Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") - Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") - TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") - Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") - Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") + days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") + months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") + totalDays = property(GetTotalDays,doc="See `GetTotalDays`") + weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") + years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") _misc_.DateSpan_swigregister(DateSpan) def DateSpan_Days(*args, **kwargs): diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 13e292c270..0bb10cbacb 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -1731,6 +1731,10 @@ class PyAuiDockArt(AuiDefaultDockArt): _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs)) PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiDockArt_swigregister(PyAuiDockArt) class PyAuiTabArt(AuiDefaultTabArt): @@ -1752,6 +1756,10 @@ class PyAuiTabArt(AuiDefaultTabArt): _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index dfab149fcb..ead0b722ba 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -3295,7 +3295,6 @@ public: DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); DEC_PYCALLBACK__FONT(SetMeasuringFont); -// DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize); PYPRIVATE; }; @@ -3304,7 +3303,6 @@ public: IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont); -//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize); #ifdef __cplusplus extern "C" { @@ -18178,6 +18176,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18207,6 +18240,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + 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; @@ -18651,9 +18719,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL}, + { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, + { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, 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/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 10eec34265..55d62582ad 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -3445,7 +3445,7 @@ public: void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { + if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) { PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 5a7b2d9916..35b0a07eed 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -8113,9 +8113,21 @@ class VisualAttributes(object): _core_.VisualAttributes_swiginit(self,_core_.new_VisualAttributes(*args, **kwargs)) __swig_destroy__ = _core_.delete_VisualAttributes __del__ = lambda self : None; - font = property(_core_.VisualAttributes_font_get, _core_.VisualAttributes_font_set) - colFg = property(_core_.VisualAttributes_colFg_get, _core_.VisualAttributes_colFg_set) - colBg = property(_core_.VisualAttributes_colBg_get, _core_.VisualAttributes_colBg_set) + def _get_font(*args, **kwargs): + """_get_font(self) -> Font""" + return _core_.VisualAttributes__get_font(*args, **kwargs) + + def _get_colFg(*args, **kwargs): + """_get_colFg(self) -> Colour""" + return _core_.VisualAttributes__get_colFg(*args, **kwargs) + + def _get_colBg(*args, **kwargs): + """_get_colBg(self) -> Colour""" + return _core_.VisualAttributes__get_colBg(*args, **kwargs) + + font = property(_get_font) + colFg = property(_get_colFg) + colBg = property(_get_colBg) _core_.VisualAttributes_swigregister(VisualAttributes) NullAcceleratorTable = cvar.NullAcceleratorTable PanelNameStr = cvar.PanelNameStr diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 44f99b750b..a8660e410d 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -3880,6 +3880,9 @@ public: static const wxString wxPyPanelNameStr(wxPanelNameStr); SWIGINTERN wxVisualAttributes *new_wxVisualAttributes(){ return new wxVisualAttributes; } SWIGINTERN void delete_wxVisualAttributes(wxVisualAttributes *self){ delete self; } +SWIGINTERN wxFont wxVisualAttributes__get_font(wxVisualAttributes *self){ return self->font; } +SWIGINTERN wxColour wxVisualAttributes__get_colFg(wxVisualAttributes *self){ return self->colFg; } +SWIGINTERN wxColour wxVisualAttributes__get_colBg(wxVisualAttributes *self){ return self->colBg; } SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){ wxWindowList& list = self->GetChildren(); return wxPy_ConvertList(&list); @@ -32567,40 +32570,10 @@ fail: } -SWIGINTERN PyObject *_wrap_VisualAttributes_font_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_font(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_font_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_font_set" "', expected argument " "2"" of type '" "wxFont *""'"); - } - arg2 = reinterpret_cast< wxFont * >(argp2); - if (arg1) (arg1)->font = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxFont *result = 0 ; + wxFont result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32609,51 +32582,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_font_get(PyObject *SWIGUNUSEDPARM(se swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_font_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_font" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxFont *)& ((arg1)->font); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFont, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_font(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxFont(static_cast< const wxFont& >(result))), SWIGTYPE_p_wxFont, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colFg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colFg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colFg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colFg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32662,51 +32610,26 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colFg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colFg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colFg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colFg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colFg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_VisualAttributes__get_colBg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *arg2 = (wxColour *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject *swig_obj[2] ; - - if (!SWIG_Python_UnpackTuple(args,"VisualAttributes_colBg_set",2,2,swig_obj)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_set" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); - } - arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxColour, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VisualAttributes_colBg_set" "', expected argument " "2"" of type '" "wxColour *""'"); - } - arg2 = reinterpret_cast< wxColour * >(argp2); - if (arg1) (arg1)->colBg = *arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ; - wxColour *result = 0 ; + wxColour result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -32715,11 +32638,16 @@ SWIGINTERN PyObject *_wrap_VisualAttributes_colBg_get(PyObject *SWIGUNUSEDPARM(s swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxVisualAttributes, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes_colBg_get" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VisualAttributes__get_colBg" "', expected argument " "1"" of type '" "wxVisualAttributes *""'"); } arg1 = reinterpret_cast< wxVisualAttributes * >(argp1); - result = (wxColour *)& ((arg1)->colBg); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxColour, 0 | 0 ); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxVisualAttributes__get_colBg(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; @@ -58394,12 +58322,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_VisualAttributes", (PyCFunction)_wrap_new_VisualAttributes, METH_NOARGS, NULL}, { (char *)"delete_VisualAttributes", (PyCFunction)_wrap_delete_VisualAttributes, METH_O, NULL}, - { (char *)"VisualAttributes_font_set", _wrap_VisualAttributes_font_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_font_get", (PyCFunction)_wrap_VisualAttributes_font_get, METH_O, NULL}, - { (char *)"VisualAttributes_colFg_set", _wrap_VisualAttributes_colFg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colFg_get", (PyCFunction)_wrap_VisualAttributes_colFg_get, METH_O, NULL}, - { (char *)"VisualAttributes_colBg_set", _wrap_VisualAttributes_colBg_set, METH_VARARGS, NULL}, - { (char *)"VisualAttributes_colBg_get", (PyCFunction)_wrap_VisualAttributes_colBg_get, METH_O, NULL}, + { (char *)"VisualAttributes__get_font", (PyCFunction)_wrap_VisualAttributes__get_font, METH_O, NULL}, + { (char *)"VisualAttributes__get_colFg", (PyCFunction)_wrap_VisualAttributes__get_colFg, METH_O, NULL}, + { (char *)"VisualAttributes__get_colBg", (PyCFunction)_wrap_VisualAttributes__get_colBg, METH_O, NULL}, { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL}, { (char *)"VisualAttributes_swiginit", VisualAttributes_swiginit, METH_VARARGS, NULL}, { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index 6ac360873b..1bd6383b80 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -4362,12 +4362,12 @@ class TimeSpan(object): def __str__(self): return self.Format().encode(wx.GetDefaultPyEncoding()) - Days = property(GetDays,doc="See `GetDays`") - Hours = property(GetHours,doc="See `GetHours`") - Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") - Minutes = property(GetMinutes,doc="See `GetMinutes`") - Seconds = property(GetSeconds,doc="See `GetSeconds`") - Weeks = property(GetWeeks,doc="See `GetWeeks`") + days = property(GetDays,doc="See `GetDays`") + hours = property(GetHours,doc="See `GetHours`") + milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") + minutes = property(GetMinutes,doc="See `GetMinutes`") + seconds = property(GetSeconds,doc="See `GetSeconds`") + weeks = property(GetWeeks,doc="See `GetWeeks`") _misc_.TimeSpan_swigregister(TimeSpan) def TimeSpan_Milliseconds(*args, **kwargs): @@ -4559,11 +4559,11 @@ class DateSpan(object): """__ne__(self, DateSpan other) -> bool""" return _misc_.DateSpan___ne__(*args, **kwargs) - Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") - Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") - TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") - Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") - Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") + days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") + months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") + totalDays = property(GetTotalDays,doc="See `GetTotalDays`") + weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") + years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") _misc_.DateSpan_swigregister(DateSpan) def DateSpan_Days(*args, **kwargs): diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 13e292c270..0bb10cbacb 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -1731,6 +1731,10 @@ class PyAuiDockArt(AuiDefaultDockArt): _aui.PyAuiDockArt_swiginit(self,_aui.new_PyAuiDockArt(*args, **kwargs)) PyAuiDockArt._setCallbackInfo(self, self, PyAuiDockArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiDockArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiDockArt_swigregister(PyAuiDockArt) class PyAuiTabArt(AuiDefaultTabArt): @@ -1752,6 +1756,10 @@ class PyAuiTabArt(AuiDefaultTabArt): _aui.PyAuiTabArt_swiginit(self,_aui.new_PyAuiTabArt(*args, **kwargs)) PyAuiTabArt._setCallbackInfo(self, self, PyAuiTabArt) + def _setCallbackInfo(*args, **kwargs): + """_setCallbackInfo(self, PyObject self, PyObject _class)""" + return _aui.PyAuiTabArt__setCallbackInfo(*args, **kwargs) + _aui.PyAuiTabArt_swigregister(PyAuiTabArt) diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 73199e9436..e5ff53d0de 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -3295,7 +3295,6 @@ public: DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); DEC_PYCALLBACK__FONT(SetMeasuringFont); -// DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize); PYPRIVATE; }; @@ -3304,7 +3303,6 @@ public: IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetNormalFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetSelectedFont); IMP_PYCALLBACK__FONT(wxPyAuiTabArt, wxAuiDefaultTabArt, SetMeasuringFont); -//IMP_PYCALLBACK_INT_WIN(wxPyAuiTabArt, wxAuiDefaultTabArt, GetBestTabCtrlSize); #ifdef __cplusplus extern "C" { @@ -18178,6 +18176,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiDockArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiDockArt *arg1 = (wxPyAuiDockArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiDockArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiDockArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiDockArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiDockArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiDockArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *PyAuiDockArt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -18207,6 +18240,41 @@ fail: } +SWIGINTERN PyObject *_wrap_PyAuiTabArt__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyAuiTabArt *arg1 = (wxPyAuiTabArt *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "self",(char *) "_class", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyAuiTabArt__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyAuiTabArt__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxPyAuiTabArt * >(argp1); + arg2 = obj1; + arg3 = obj2; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->_setCallbackInfo(arg2,arg3); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + 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; @@ -18651,9 +18719,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiMDIClientWindow_swigregister", AuiMDIClientWindow_swigregister, METH_VARARGS, NULL}, { (char *)"AuiMDIClientWindow_swiginit", AuiMDIClientWindow_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiDockArt", (PyCFunction)_wrap_new_PyAuiDockArt, METH_NOARGS, NULL}, + { (char *)"PyAuiDockArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiDockArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyAuiDockArt_swigregister", PyAuiDockArt_swigregister, METH_VARARGS, NULL}, { (char *)"PyAuiDockArt_swiginit", PyAuiDockArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_PyAuiTabArt", (PyCFunction)_wrap_new_PyAuiTabArt, METH_NOARGS, NULL}, + { (char *)"PyAuiTabArt__setCallbackInfo", (PyCFunction) _wrap_PyAuiTabArt__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, 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/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index ff699cb5ce..474fc5f701 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -3445,7 +3445,7 @@ public: void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { + if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) { PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);