X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41e2b43ea4fd82f188cf6f62b71c67bca8844ae9..fdf7514a009227ebf09cf8e184b3d96aa33eb026:/wxPython/src/gtk/grid_wrap.cpp diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index 91bec8fbcc..135fb205e1 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -328,7 +328,7 @@ static swig_type_info *swig_types[54]; #define wxPyMake_TEMPLATE(TYPE) \ -PyObject* wxPyMake_##TYPE(TYPE* source) { \ +PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \ PyObject* target = NULL; \ if (source) { \ /* Check if there is already a pointer to a Python object in the \ @@ -341,7 +341,7 @@ PyObject* wxPyMake_##TYPE(TYPE* source) { \ /* Otherwise make a new wrapper for it the old fashioned way and \ give it the OOR treatment */ \ if (! target) { \ - target = wxPyConstructObject(source, wxT(#TYPE), False); \ + target = wxPyConstructObject(source, wxT(#TYPE), setThisOwn); \ if (target) \ source->SetClientObject(new wxPyOORClientData(target)); \ } \ @@ -391,7 +391,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool blocked = wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyMake_wxGridCellAttr(attr); \ + PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ Py_DECREF(obj); \ } \ @@ -410,7 +410,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool blocked = wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyMake_wxGridCellAttr(attr); \ + PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \ Py_DECREF(obj); \ } \ @@ -884,9 +884,9 @@ public: int row, int col, bool isSelected) { bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Draw")) { - PyObject* go = wxPyMake_wxObject(&grid); - PyObject* dco = wxPyMake_wxObject(&dc); - PyObject* ao = wxPyMake_wxGridCellAttr(&attr); + PyObject* go = wxPyMake_wxObject(&grid,false); + PyObject* dco = wxPyMake_wxObject(&dc,false); + PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false); PyObject* ro = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro, @@ -906,9 +906,9 @@ public: if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) { PyObject* ro; wxSize* ptr; - PyObject* go = wxPyMake_wxObject(&grid); - PyObject* dco = wxPyMake_wxObject(&dc); - PyObject* ao = wxPyMake_wxGridCellAttr(&attr); + PyObject* go = wxPyMake_wxObject(&grid,false); + PyObject* dco = wxPyMake_wxObject(&dc,false); + PyObject* ao = wxPyMake_wxGridCellAttr(&attr,false); ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)", go, ao, dco, @@ -980,8 +980,8 @@ public: void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Create")) { - PyObject* po = wxPyMake_wxObject(parent); - PyObject* eo = wxPyMake_wxObject(evtHandler); + PyObject* po = wxPyMake_wxObject(parent,false); + PyObject* eo = wxPyMake_wxObject(evtHandler,false); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo)); Py_DECREF(po); @@ -994,7 +994,7 @@ public: void BeginEdit(int row, int col, wxGrid* grid) { bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) { - PyObject* go = wxPyMake_wxObject(grid); + PyObject* go = wxPyMake_wxObject(grid,false); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); Py_DECREF(go); } @@ -1006,7 +1006,7 @@ public: bool rv = False; bool blocked = wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "EndEdit")) { - PyObject* go = wxPyMake_wxObject(grid); + PyObject* go = wxPyMake_wxObject(grid,false); rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); Py_DECREF(go); } @@ -1037,7 +1037,7 @@ public: bool found; bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) { - PyObject* ao = wxPyMake_wxGridCellAttr(attr); + PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao)); Py_DECREF(ao); } @@ -1054,7 +1054,7 @@ public: bool found; bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { - PyObject* ao = wxPyMake_wxGridCellAttr(attr); + PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao)); @@ -1252,6 +1252,11 @@ public: PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col)); if (ro) { + if (!PyString_Check(ro) && !PyUnicode_Check(ro)) { + PyObject* old = ro; + ro = PyObject_Str(ro); + Py_DECREF(old); + } rval = Py2wxString(ro); Py_DECREF(ro); } @@ -1381,7 +1386,7 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { bool wxGridCellCoords_typecheck(PyObject* source) { void* ptr; - + if (wxPySwigInstance_Check(source) && wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords"))) return True; @@ -1389,7 +1394,7 @@ bool wxGridCellCoords_typecheck(PyObject* source) { PyErr_Clear(); if (PySequence_Check(source) && PySequence_Length(source) == 2) return True; - + return False; } @@ -1749,7 +1754,7 @@ static PyObject *_wrap_GridCellRenderer_Clone(PyObject *self, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } return resultobj; fail: @@ -2305,7 +2310,7 @@ static PyObject *_wrap_GridCellEditor_GetControl(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -2362,7 +2367,7 @@ static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *self, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -2649,7 +2654,7 @@ static PyObject *_wrap_GridCellEditor_Clone(PyObject *self, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } return resultobj; fail: @@ -3823,7 +3828,7 @@ static PyObject *_wrap_new_GridCellAttr(PyObject *self, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 1); } return resultobj; fail: @@ -3851,7 +3856,7 @@ static PyObject *_wrap_GridCellAttr_Clone(PyObject *self, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -4703,7 +4708,7 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } return resultobj; fail: @@ -4743,7 +4748,7 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } return resultobj; fail: @@ -4779,6 +4784,32 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P } +static PyObject *_wrap_GridCellAttr_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellAttr_GetKind",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->GetKind(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_FromInt((int)result); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GridCellAttr_SetDefAttr(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ; @@ -4831,7 +4862,7 @@ static PyObject *_wrap_new_GridCellAttrProvider(PyObject *self, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result); + resultobj = wxPyMake_wxGridCellAttrProvider(result, 1); } return resultobj; fail: @@ -4899,7 +4930,7 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -5168,7 +5199,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -5363,7 +5394,7 @@ static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *self, PyObject *a if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result); + resultobj = wxPyMake_wxGridCellAttrProvider(result, 0); } return resultobj; fail: @@ -5420,7 +5451,7 @@ static PyObject *_wrap_GridTableBase_GetView(PyObject *self, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -6439,7 +6470,7 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -7254,7 +7285,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result); + resultobj = wxPyMake_wxGridCellAttr(result, 0); } return resultobj; fail: @@ -7529,7 +7560,7 @@ static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *self, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result); + resultobj = wxPyMake_wxGridTableBase(result, 0); } return resultobj; fail: @@ -8017,7 +8048,7 @@ static PyObject * GridCellCoords_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 ; + int arg2 = (int) -1 ; wxPoint const &arg3_defvalue = wxDefaultPosition ; wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; @@ -8039,11 +8070,13 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Grid",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOO:new_Grid",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; - arg2 = (int) SWIG_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } if (obj2) { { arg3 = &temp3; @@ -8068,6 +8101,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs } } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = (wxGrid *)new wxGrid(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); @@ -8075,7 +8109,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 1); } { if (temp6) @@ -8091,6 +8125,114 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs } +static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGrid *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreGrid",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGrid *)new wxGrid(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxObject(result, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Grid_Create(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGrid *arg1 = (wxGrid *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 = (int) -1 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) wxWANTS_CHARS ; + wxString const &arg7_defvalue = wxPyPanelNameStr ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOO:Grid_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + if (obj2) { + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + arg6 = (long) SWIG_AsLong(obj5); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = True; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGrid *arg1 = (wxGrid *) 0 ; @@ -8297,7 +8439,7 @@ static PyObject *_wrap_Grid_GetTable(PyObject *self, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result); + resultobj = wxPyMake_wxGridTableBase(result, 0); } return resultobj; fail: @@ -12928,7 +13070,7 @@ static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *self, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } return resultobj; fail: @@ -12964,7 +13106,7 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } return resultobj; fail: @@ -13058,7 +13200,7 @@ static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *self, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } return resultobj; fail: @@ -13094,7 +13236,7 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } return resultobj; fail: @@ -13985,7 +14127,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } return resultobj; fail: @@ -14021,7 +14163,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } return resultobj; fail: @@ -14057,7 +14199,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *self, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result); + resultobj = wxPyMake_wxGridCellEditor(result, 0); } { if (temp2) @@ -14101,7 +14243,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *self, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result); + resultobj = wxPyMake_wxGridCellRenderer(result, 0); } { if (temp2) @@ -14170,7 +14312,7 @@ static PyObject *_wrap_Grid_GetGridWindow(PyObject *self, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -14198,7 +14340,7 @@ static PyObject *_wrap_Grid_GetGridRowLabelWindow(PyObject *self, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -14226,7 +14368,7 @@ static PyObject *_wrap_Grid_GetGridColLabelWindow(PyObject *self, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -14254,7 +14396,7 @@ static PyObject *_wrap_Grid_GetGridCornerLabelWindow(PyObject *self, PyObject *a if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -14277,6 +14419,7 @@ static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *self, PyObject * if (PyErr_Occurred()) SWIG_fail; } { + if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); result = wxGrid::GetClassDefaultAttributes((wxWindowVariant )arg1); @@ -15376,7 +15519,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetControl(PyObject *self, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -15598,6 +15741,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellAttr_GetRenderer", (PyCFunction) _wrap_GridCellAttr_GetRenderer, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellAttr_GetEditor", (PyCFunction) _wrap_GridCellAttr_GetEditor, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellAttr_IsReadOnly", (PyCFunction) _wrap_GridCellAttr_IsReadOnly, METH_VARARGS | METH_KEYWORDS }, + { (char *)"GridCellAttr_GetKind", (PyCFunction) _wrap_GridCellAttr_GetKind, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellAttr_SetDefAttr", (PyCFunction) _wrap_GridCellAttr_SetDefAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellAttr_swigregister", GridCellAttr_swigregister, METH_VARARGS }, { (char *)"new_GridCellAttrProvider", (PyCFunction) _wrap_new_GridCellAttrProvider, METH_VARARGS | METH_KEYWORDS }, @@ -15700,6 +15844,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellCoords_Get", (PyCFunction) _wrap_GridCellCoords_Get, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellCoords_swigregister", GridCellCoords_swigregister, METH_VARARGS }, { (char *)"new_Grid", (PyCFunction) _wrap_new_Grid, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_PreGrid", (PyCFunction) _wrap_new_PreGrid, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Grid_Create", (PyCFunction) _wrap_Grid_Create, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_CreateGrid", (PyCFunction) _wrap_Grid_CreateGrid, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_SetSelectionMode", (PyCFunction) _wrap_Grid_SetSelectionMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_GetSelectionMode", (PyCFunction) _wrap_Grid_GetSelectionMode, METH_VARARGS | METH_KEYWORDS },