diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i index 1464154828..6bf2d04be8 100644 --- a/utils/wxPython/src/events.i +++ b/utils/wxPython/src/events.i @@ -388,14 +388,14 @@ public: //--------------------------------------------------------------------------- -class wxWindowCreateEvent : public wxEvent { +class wxWindowCreateEvent : public wxCommandEvent { public: wxWindowCreateEvent(wxWindow *win = NULL); wxWindow *GetWindow(); }; -class wxWindowDestroyEvent : public wxEvent { +class wxWindowDestroyEvent : public wxCommandEvent { public: wxWindowDestroyEvent(wxWindow *win = NULL); diff --git a/utils/wxPython/src/grid.i b/utils/wxPython/src/grid.i index ee9cc3af9b..c6d4bb27e2 100644 --- a/utils/wxPython/src/grid.i +++ b/utils/wxPython/src/grid.i @@ -936,9 +936,6 @@ public: virtual bool CanHaveAttributes(); - virtual void UpdateAttrRows( size_t pos, int numRows ); - virtual void UpdateAttrCols( size_t pos, int numCols ); - virtual wxGridCellAttr *GetAttr( int row, int col ); virtual void SetAttr(wxGridCellAttr* attr, int row, int col); virtual void SetRowAttr(wxGridCellAttr *attr, int row); @@ -958,17 +955,9 @@ public: PYCALLBACK_INT__pure(GetNumberRows); PYCALLBACK_INT__pure(GetNumberCols); PYCALLBACK_BOOL_INTINT_pure(IsEmptyCell); - //PYCALLBACK_STRING_INTINT_pure(GetValue); - //PYCALLBACK__INTINTSTRING_pure(SetValue); PYCALLBACK_STRING_INTINT(wxGridTableBase, GetTypeName); PYCALLBACK_BOOL_INTINTSTRING(wxGridTableBase, CanGetValueAs); PYCALLBACK_BOOL_INTINTSTRING(wxGridTableBase, CanSetValueAs); - //PYCALLBACK_LONG_INTINT(wxGridTableBase, GetValueAsLong); - //PYCALLBACK_DOUBLE_INTINT(wxGridTableBase, GetValueAsDouble); - //PYCALLBACK_BOOL_INTINT(wxGridTableBase, GetValueAsBool); - //PYCALLBACK__INTINTLONG(wxGridTableBase, SetValueAsLong); - //PYCALLBACK__INTINTDOUBLE(wxGridTableBase, SetValueAsDouble); - //PYCALLBACK__INTINTBOOL(wxGridTableBase, SetValueAsBool); PYCALLBACK__(wxGridTableBase, Clear); PYCALLBACK_BOOL_SIZETSIZET(wxGridTableBase, InsertRows); PYCALLBACK_BOOL_SIZETSIZET(wxGridTableBase, DeleteRows); @@ -981,8 +970,6 @@ public: PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue); PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue); PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes); - PYCALLBACK__SIZETINT(wxGridTableBase, UpdateAttrRows); - PYCALLBACK__SIZETINT(wxGridTableBase, UpdateAttrCols); PYCALLBACK_GCA_INTINT(wxGridTableBase, GetAttr); PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr); PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr); @@ -1080,14 +1067,6 @@ public: } - - //TODO: void* GetValueAsCustom( int row, int col, const wxString& typeName ); - //TODO: void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ); - // - // It would be nice to SetValue/GetValue in the Python code to be able to - // work with any python objects and auto-convert to the various types for - // the C++ code. Figure it out. - PYPRIVATE; }; %} @@ -1106,12 +1085,6 @@ public: wxString base_GetTypeName( int row, int col ); bool base_CanGetValueAs( int row, int col, const wxString& typeName ); bool base_CanSetValueAs( int row, int col, const wxString& typeName ); - //long base_GetValueAsLong( int row, int col ); - //double base_GetValueAsDouble( int row, int col ); - //bool base_GetValueAsBool( int row, int col ); - //void base_SetValueAsLong( int row, int col, long value ); - //void base_SetValueAsDouble( int row, int col, double value ); - //void base_SetValueAsBool( int row, int col, bool value ); void base_Clear(); bool base_InsertRows( size_t pos = 0, size_t numRows = 1 ); bool base_AppendRows( size_t numRows = 1 ); @@ -1124,8 +1097,6 @@ public: void base_SetRowLabelValue( int row, const wxString& value ); void base_SetColLabelValue( int col, const wxString& value ); bool base_CanHaveAttributes(); - void base_UpdateAttrRows( size_t pos, int numRows ); - void base_UpdateAttrCols( size_t pos, int numCols ); wxGridCellAttr *base_GetAttr( int row, int col ); void base_SetAttr(wxGridCellAttr* attr, int row, int col); void base_SetRowAttr(wxGridCellAttr *attr, int row); diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp index fd83a70aa7..739f011fac 100644 --- a/utils/wxPython/src/msw/events.cpp +++ b/utils/wxPython/src/msw/events.cpp @@ -4537,6 +4537,14 @@ static PyObject *_wrap_wxQueryNewPaletteEvent_GetPaletteRealized(PyObject *self, return _resultobj; } +static void *SwigwxWindowCreateEventTowxCommandEvent(void *ptr) { + wxWindowCreateEvent *src; + wxCommandEvent *dest; + src = (wxWindowCreateEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; +} + static void *SwigwxWindowCreateEventTowxEvent(void *ptr) { wxWindowCreateEvent *src; wxEvent *dest; @@ -4613,6 +4621,14 @@ static PyObject *_wrap_wxWindowCreateEvent_GetWindow(PyObject *self, PyObject *a return _resultobj; } +static void *SwigwxWindowDestroyEventTowxCommandEvent(void *ptr) { + wxWindowDestroyEvent *src; + wxCommandEvent *dest; + src = (wxWindowDestroyEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; +} + static void *SwigwxWindowDestroyEventTowxEvent(void *ptr) { wxWindowDestroyEvent *src; wxEvent *dest; @@ -5286,6 +5302,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRect","_class_wxRect",0}, { "_wxCommandEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, + { "_wxCommandEvent","_class_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxCommandEvent}, + { "_wxCommandEvent","_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxCommandEvent}, + { "_wxCommandEvent","_class_wxWindowCreateEvent",SwigwxWindowCreateEventTowxCommandEvent}, + { "_wxCommandEvent","_wxWindowCreateEvent",SwigwxWindowCreateEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, @@ -5405,6 +5425,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxBusyInfo","_wxBusyInfo",0}, { "_class_wxCommandEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, + { "_class_wxCommandEvent","_class_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxCommandEvent}, + { "_class_wxCommandEvent","_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxCommandEvent}, + { "_class_wxCommandEvent","_class_wxWindowCreateEvent",SwigwxWindowCreateEventTowxCommandEvent}, + { "_class_wxCommandEvent","_wxWindowCreateEvent",SwigwxWindowCreateEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, diff --git a/utils/wxPython/src/msw/events.py b/utils/wxPython/src/msw/events.py index f088e26c73..d78e4aeb04 100644 --- a/utils/wxPython/src/msw/events.py +++ b/utils/wxPython/src/msw/events.py @@ -760,7 +760,7 @@ class wxQueryNewPaletteEvent(wxQueryNewPaletteEventPtr): -class wxWindowCreateEventPtr(wxEventPtr): +class wxWindowCreateEventPtr(wxCommandEventPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -778,7 +778,7 @@ class wxWindowCreateEvent(wxWindowCreateEventPtr): -class wxWindowDestroyEventPtr(wxEventPtr): +class wxWindowDestroyEventPtr(wxCommandEventPtr): def __init__(self,this): self.this = this self.thisown = 0 diff --git a/utils/wxPython/src/msw/grid.cpp b/utils/wxPython/src/msw/grid.cpp index f56db9d8e7..0e990d2d72 100644 --- a/utils/wxPython/src/msw/grid.cpp +++ b/utils/wxPython/src/msw/grid.cpp @@ -686,17 +686,9 @@ public: PYCALLBACK_INT__pure(GetNumberRows); PYCALLBACK_INT__pure(GetNumberCols); PYCALLBACK_BOOL_INTINT_pure(IsEmptyCell); - //PYCALLBACK_STRING_INTINT_pure(GetValue); - //PYCALLBACK__INTINTSTRING_pure(SetValue); PYCALLBACK_STRING_INTINT(wxGridTableBase, GetTypeName); PYCALLBACK_BOOL_INTINTSTRING(wxGridTableBase, CanGetValueAs); PYCALLBACK_BOOL_INTINTSTRING(wxGridTableBase, CanSetValueAs); - //PYCALLBACK_LONG_INTINT(wxGridTableBase, GetValueAsLong); - //PYCALLBACK_DOUBLE_INTINT(wxGridTableBase, GetValueAsDouble); - //PYCALLBACK_BOOL_INTINT(wxGridTableBase, GetValueAsBool); - //PYCALLBACK__INTINTLONG(wxGridTableBase, SetValueAsLong); - //PYCALLBACK__INTINTDOUBLE(wxGridTableBase, SetValueAsDouble); - //PYCALLBACK__INTINTBOOL(wxGridTableBase, SetValueAsBool); PYCALLBACK__(wxGridTableBase, Clear); PYCALLBACK_BOOL_SIZETSIZET(wxGridTableBase, InsertRows); PYCALLBACK_BOOL_SIZETSIZET(wxGridTableBase, DeleteRows); @@ -709,8 +701,6 @@ public: PYCALLBACK__INTSTRING(wxGridTableBase, SetRowLabelValue); PYCALLBACK__INTSTRING(wxGridTableBase, SetColLabelValue); PYCALLBACK_BOOL_(wxGridTableBase, CanHaveAttributes); - PYCALLBACK__SIZETINT(wxGridTableBase, UpdateAttrRows); - PYCALLBACK__SIZETINT(wxGridTableBase, UpdateAttrCols); PYCALLBACK_GCA_INTINT(wxGridTableBase, GetAttr); PYCALLBACK__GCAINTINT(wxGridTableBase, SetAttr); PYCALLBACK__GCAINT(wxGridTableBase, SetRowAttr); @@ -808,14 +798,6 @@ public: } - - //TODO: void* GetValueAsCustom( int row, int col, const wxString& typeName ); - //TODO: void SetValueAsCustom( int row, int col, const wxString& typeName, void* value ); - // - // It would be nice to SetValue/GetValue in the Python code to be able to - // work with any python objects and auto-convert to the various types for - // the C++ code. Figure it out. - PYPRIVATE; }; @@ -4808,64 +4790,6 @@ static PyObject *_wrap_wxGridTableBase_CanHaveAttributes(PyObject *self, PyObjec return _resultobj; } -#define wxGridTableBase_UpdateAttrRows(_swigobj,_swigarg0,_swigarg1) (_swigobj->UpdateAttrRows(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxGridTableBase_UpdateAttrRows(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGridTableBase * _arg0; - size_t _arg1; - int _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos","numRows", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGridTableBase_UpdateAttrRows",_kwnames,&_argo0,&_arg1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridTableBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridTableBase_UpdateAttrRows. Expected _wxGridTableBase_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGridTableBase_UpdateAttrRows(_arg0,_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxGridTableBase_UpdateAttrCols(_swigobj,_swigarg0,_swigarg1) (_swigobj->UpdateAttrCols(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxGridTableBase_UpdateAttrCols(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxGridTableBase * _arg0; - size_t _arg1; - int _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos","numCols", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGridTableBase_UpdateAttrCols",_kwnames,&_argo0,&_arg1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridTableBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridTableBase_UpdateAttrCols. Expected _wxGridTableBase_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxGridTableBase_UpdateAttrCols(_arg0,_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxGridTableBase_GetAttr(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetAttr(_swigarg0,_swigarg1)) static PyObject *_wrap_wxGridTableBase_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5603,64 +5527,6 @@ static PyObject *_wrap_wxPyGridTableBase_base_CanHaveAttributes(PyObject *self, return _resultobj; } -#define wxPyGridTableBase_base_UpdateAttrRows(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_UpdateAttrRows(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPyGridTableBase_base_UpdateAttrRows(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxPyGridTableBase * _arg0; - size_t _arg1; - int _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos","numRows", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPyGridTableBase_base_UpdateAttrRows",_kwnames,&_argo0,&_arg1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridTableBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridTableBase_base_UpdateAttrRows. Expected _wxPyGridTableBase_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxPyGridTableBase_base_UpdateAttrRows(_arg0,_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxPyGridTableBase_base_UpdateAttrCols(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_UpdateAttrCols(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPyGridTableBase_base_UpdateAttrCols(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxPyGridTableBase * _arg0; - size_t _arg1; - int _arg2; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","pos","numCols", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPyGridTableBase_base_UpdateAttrCols",_kwnames,&_argo0,&_arg1,&_arg2)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyGridTableBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyGridTableBase_base_UpdateAttrCols. Expected _wxPyGridTableBase_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxPyGridTableBase_base_UpdateAttrCols(_arg0,_arg1,_arg2); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxPyGridTableBase_base_GetAttr(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_GetAttr(_swigarg0,_swigarg1)) static PyObject *_wrap_wxPyGridTableBase_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5881,6 +5747,33 @@ static PyObject *_wrap_new_wxGridTableMessage(PyObject *self, PyObject *args, Py return _resultobj; } +#define delete_wxGridTableMessage(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxGridTableMessage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridTableMessage * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxGridTableMessage",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridTableMessage_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGridTableMessage. Expected _wxGridTableMessage_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + delete_wxGridTableMessage(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGridTableMessage_SetTableObject(_swigobj,_swigarg0) (_swigobj->SetTableObject(_swigarg0)) static PyObject *_wrap_wxGridTableMessage_SetTableObject(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -12650,14 +12543,13 @@ static PyMethodDef gridcMethods[] = { { "wxGridTableMessage_SetId", (PyCFunction) _wrap_wxGridTableMessage_SetId, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableMessage_GetTableObject", (PyCFunction) _wrap_wxGridTableMessage_GetTableObject, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableMessage_SetTableObject", (PyCFunction) _wrap_wxGridTableMessage_SetTableObject, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxGridTableMessage", (PyCFunction) _wrap_delete_wxGridTableMessage, METH_VARARGS | METH_KEYWORDS }, { "new_wxGridTableMessage", (PyCFunction) _wrap_new_wxGridTableMessage, METH_VARARGS | METH_KEYWORDS }, { "new_wxGridStringTable", (PyCFunction) _wrap_new_wxGridStringTable, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_SetColAttr", (PyCFunction) _wrap_wxPyGridTableBase_base_SetColAttr, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_SetRowAttr", (PyCFunction) _wrap_wxPyGridTableBase_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_SetAttr", (PyCFunction) _wrap_wxPyGridTableBase_base_SetAttr, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_GetAttr", (PyCFunction) _wrap_wxPyGridTableBase_base_GetAttr, METH_VARARGS | METH_KEYWORDS }, - { "wxPyGridTableBase_base_UpdateAttrCols", (PyCFunction) _wrap_wxPyGridTableBase_base_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS }, - { "wxPyGridTableBase_base_UpdateAttrRows", (PyCFunction) _wrap_wxPyGridTableBase_base_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_CanHaveAttributes", (PyCFunction) _wrap_wxPyGridTableBase_base_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_SetColLabelValue", (PyCFunction) _wrap_wxPyGridTableBase_base_SetColLabelValue, METH_VARARGS | METH_KEYWORDS }, { "wxPyGridTableBase_base_SetRowLabelValue", (PyCFunction) _wrap_wxPyGridTableBase_base_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS }, @@ -12680,8 +12572,6 @@ static PyMethodDef gridcMethods[] = { { "wxGridTableBase_SetRowAttr", (PyCFunction) _wrap_wxGridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableBase_SetAttr", (PyCFunction) _wrap_wxGridTableBase_SetAttr, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableBase_GetAttr", (PyCFunction) _wrap_wxGridTableBase_GetAttr, METH_VARARGS | METH_KEYWORDS }, - { "wxGridTableBase_UpdateAttrCols", (PyCFunction) _wrap_wxGridTableBase_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS }, - { "wxGridTableBase_UpdateAttrRows", (PyCFunction) _wrap_wxGridTableBase_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableBase_CanHaveAttributes", (PyCFunction) _wrap_wxGridTableBase_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableBase_SetColLabelValue", (PyCFunction) _wrap_wxGridTableBase_SetColLabelValue, METH_VARARGS | METH_KEYWORDS }, { "wxGridTableBase_SetRowLabelValue", (PyCFunction) _wrap_wxGridTableBase_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/msw/grid.py b/utils/wxPython/src/msw/grid.py index dd58c21138..e962cc3a3b 100644 --- a/utils/wxPython/src/msw/grid.py +++ b/utils/wxPython/src/msw/grid.py @@ -603,12 +603,6 @@ class wxGridTableBasePtr : def CanHaveAttributes(self, *_args, **_kwargs): val = apply(gridc.wxGridTableBase_CanHaveAttributes,(self,) + _args, _kwargs) return val - def UpdateAttrRows(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_UpdateAttrRows,(self,) + _args, _kwargs) - return val - def UpdateAttrCols(self, *_args, **_kwargs): - val = apply(gridc.wxGridTableBase_UpdateAttrCols,(self,) + _args, _kwargs) - return val def GetAttr(self, *_args, **_kwargs): val = apply(gridc.wxGridTableBase_GetAttr,(self,) + _args, _kwargs) if val: val = wxGridCellAttrPtr(val) @@ -686,12 +680,6 @@ class wxPyGridTableBasePtr(wxGridTableBasePtr): def base_CanHaveAttributes(self, *_args, **_kwargs): val = apply(gridc.wxPyGridTableBase_base_CanHaveAttributes,(self,) + _args, _kwargs) return val - def base_UpdateAttrRows(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_UpdateAttrRows,(self,) + _args, _kwargs) - return val - def base_UpdateAttrCols(self, *_args, **_kwargs): - val = apply(gridc.wxPyGridTableBase_base_UpdateAttrCols,(self,) + _args, _kwargs) - return val def base_GetAttr(self, *_args, **_kwargs): val = apply(gridc.wxPyGridTableBase_base_GetAttr,(self,) + _args, _kwargs) if val: val = wxGridCellAttrPtr(val) @@ -734,6 +722,9 @@ class wxGridTableMessagePtr : def __init__(self,this): self.this = this self.thisown = 0 + def __del__(self,gridc=gridc): + if self.thisown == 1 : + gridc.delete_wxGridTableMessage(self) def SetTableObject(self, *_args, **_kwargs): val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs) return val