X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2482628795b7de454ef093cb24910c98ad51f1d..f5b96ee156e44f7f68451fbb6e8529a99a65cb44:/wxPython/src/msw/grid_wrap.cpp diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index d2c0dc7ad5..8b1ba120bb 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -220,45 +220,46 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxDC swig_types[11] #define SWIGTYPE_p_wxGridTableMessage swig_types[12] #define SWIGTYPE_p_wxGrid swig_types[13] -#define SWIGTYPE_p_char swig_types[14] -#define SWIGTYPE_p_wxPanel swig_types[15] -#define SWIGTYPE_p_wxNotifyEvent swig_types[16] -#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[17] -#define SWIGTYPE_p_wxSize swig_types[18] -#define SWIGTYPE_p_wxGridCellCoords swig_types[19] -#define SWIGTYPE_p_wxScrolledWindow swig_types[20] -#define SWIGTYPE_p_wxWindow swig_types[21] -#define SWIGTYPE_p_wxFont swig_types[22] -#define SWIGTYPE_p_wxControl swig_types[23] -#define SWIGTYPE_p_wxEvent swig_types[24] -#define SWIGTYPE_p_wxObject swig_types[25] -#define SWIGTYPE_p_wxGridSizeEvent swig_types[26] -#define SWIGTYPE_p_wxRect swig_types[27] -#define SWIGTYPE_p_long swig_types[28] -#define SWIGTYPE_p_wxString swig_types[29] -#define SWIGTYPE_p_wxEvtHandler swig_types[30] -#define SWIGTYPE_p_wxPoint swig_types[31] -#define SWIGTYPE_p_wxGridEvent swig_types[32] -#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[33] -#define SWIGTYPE_p_wxGridTableBase swig_types[34] -#define SWIGTYPE_p_wxGridCellNumberEditor swig_types[35] -#define SWIGTYPE_p_wxPyGridCellEditor swig_types[36] -#define SWIGTYPE_p_wxGridCellEditor swig_types[37] -#define SWIGTYPE_p_wxGridCellTextEditor swig_types[38] -#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[39] -#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[40] -#define SWIGTYPE_p_wxPyGridTableBase swig_types[41] -#define SWIGTYPE_p_wxGridStringTable swig_types[42] -#define SWIGTYPE_p_wxArrayString swig_types[43] -#define SWIGTYPE_p_wxCommandEvent swig_types[44] -#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[45] -#define SWIGTYPE_p_wxKeyEvent swig_types[46] -#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[47] -#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[48] -#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[49] -#define SWIGTYPE_p_int swig_types[50] -#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[51] -static swig_type_info *swig_types[53]; +#define SWIGTYPE_p_wxVisualAttributes swig_types[14] +#define SWIGTYPE_p_char swig_types[15] +#define SWIGTYPE_p_wxPanel swig_types[16] +#define SWIGTYPE_p_wxNotifyEvent swig_types[17] +#define SWIGTYPE_p_wxGridRangeSelectEvent swig_types[18] +#define SWIGTYPE_p_wxSize swig_types[19] +#define SWIGTYPE_p_wxGridCellCoords swig_types[20] +#define SWIGTYPE_p_wxScrolledWindow swig_types[21] +#define SWIGTYPE_p_wxWindow swig_types[22] +#define SWIGTYPE_p_wxFont swig_types[23] +#define SWIGTYPE_p_wxControl swig_types[24] +#define SWIGTYPE_p_wxEvent swig_types[25] +#define SWIGTYPE_p_wxObject swig_types[26] +#define SWIGTYPE_p_wxGridSizeEvent swig_types[27] +#define SWIGTYPE_p_wxRect swig_types[28] +#define SWIGTYPE_p_long swig_types[29] +#define SWIGTYPE_p_wxString swig_types[30] +#define SWIGTYPE_p_wxEvtHandler swig_types[31] +#define SWIGTYPE_p_wxPoint swig_types[32] +#define SWIGTYPE_p_wxGridEvent swig_types[33] +#define SWIGTYPE_p_wxGridEditorCreatedEvent swig_types[34] +#define SWIGTYPE_p_wxGridTableBase swig_types[35] +#define SWIGTYPE_p_wxGridCellNumberEditor swig_types[36] +#define SWIGTYPE_p_wxPyGridCellEditor swig_types[37] +#define SWIGTYPE_p_wxGridCellEditor swig_types[38] +#define SWIGTYPE_p_wxGridCellTextEditor swig_types[39] +#define SWIGTYPE_p_wxGridCellFloatEditor swig_types[40] +#define SWIGTYPE_p_wxGridCellBoolEditor swig_types[41] +#define SWIGTYPE_p_wxPyGridTableBase swig_types[42] +#define SWIGTYPE_p_wxGridStringTable swig_types[43] +#define SWIGTYPE_p_wxArrayString swig_types[44] +#define SWIGTYPE_p_wxCommandEvent swig_types[45] +#define SWIGTYPE_p_wxGridCellAttrProvider swig_types[46] +#define SWIGTYPE_p_wxKeyEvent swig_types[47] +#define SWIGTYPE_p_wxGridCellChoiceEditor swig_types[48] +#define SWIGTYPE_p_wxGridCellEnumEditor swig_types[49] +#define SWIGTYPE_p_wxGridCellAutoWrapStringEditor swig_types[50] +#define SWIGTYPE_p_int swig_types[51] +#define SWIGTYPE_p_wxPyGridCellAttrProvider swig_types[52] +static swig_type_info *swig_types[54]; /* -------- TYPES TABLE (END) -------- */ @@ -327,7 +328,7 @@ static swig_type_info *swig_types[53]; #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 \ @@ -335,12 +336,13 @@ PyObject* wxPyMake_##TYPE(TYPE* source) { \ wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ if (data) { \ target = data->m_obj; \ - Py_INCREF(target); \ + if (target) \ + Py_INCREF(target); \ } \ /* 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)); \ } \ @@ -390,7 +392,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); \ } \ @@ -409,7 +411,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); \ } \ @@ -780,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr) } } + +#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS +#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS +#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT +#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH +#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT +#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH +#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE +#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT +#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH +#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH + void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } #include @@ -814,7 +829,15 @@ SWIG_CheckLongInRange(long value, const char* type, SWIGSTATICINLINE(long) SWIG_AsLong(PyObject * obj) { - return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); + if (PyNumber_Check(obj)) + return PyInt_AsLong(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } } @@ -875,9 +898,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, @@ -897,9 +920,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, @@ -960,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters) void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } class wxPyGridCellEditor : public wxGridCellEditor @@ -971,8 +995,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); @@ -985,7 +1009,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); } @@ -997,7 +1021,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); } @@ -1028,7 +1052,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); } @@ -1045,7 +1069,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)); @@ -1088,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue) void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -1118,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(unsigned long) @@ -1127,9 +1153,9 @@ SWIG_AsUnsignedLong(PyObject * obj) if (PyLong_Check(obj)) { return PyLong_AsUnsignedLong(obj); } else { - long i = PyInt_AsLong(obj); + long i = SWIG_AsLong(obj); if ( !PyErr_Occurred() && (i < 0)) { - PyErr_SetString(PyExc_TypeError, "negative value for unsigned type"); + PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type"); } return i; } @@ -1163,7 +1189,8 @@ public: }; void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(int) @@ -1182,17 +1209,15 @@ SWIG_CheckLong(PyObject* obj) SWIGSTATICINLINE(double) SWIG_AsDouble(PyObject *obj) { - double val = (PyFloat_Check(obj)) ? PyFloat_AsDouble(obj) : -#if HAVE_LONG_LONG - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLongLong(obj)); -#else - ((PyInt_Check(obj)) ? PyInt_AsLong(obj) : PyLong_AsLong(obj)); -#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - PyErr_SetString(PyExc_TypeError, "a double is expected"); - } - return val; + if (PyNumber_Check(obj)) + return PyFloat_AsDouble(obj); + else { + PyObject* errmsg = PyString_FromFormat("Expected number, got %s", + obj->ob_type->tp_name); + PyErr_SetObject(PyExc_TypeError, errmsg); + Py_DECREF(errmsg); + return 0; + } } @@ -1245,6 +1270,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); } @@ -1374,7 +1404,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; @@ -1382,7 +1412,7 @@ bool wxGridCellCoords_typecheck(PyObject* source) { PyErr_Clear(); if (PySequence_Check(source) && PySequence_Length(source) == 2) return True; - + return False; } @@ -1402,7 +1432,7 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source) return list; } -PyObject *wxGridCellCoords_asTuple(wxGridCellCoords *self){ +PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){ PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); @@ -1742,7 +1772,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: @@ -2298,7 +2328,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: @@ -2355,7 +2385,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: @@ -2642,7 +2672,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: @@ -3410,15 +3440,27 @@ static PyObject * GridCellNumberEditor_swigregister(PyObject *self, PyObject *ar } static PyObject *_wrap_new_GridCellFloatEditor(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; + int arg1 = (int) -1 ; + int arg2 = (int) -1 ; wxGridCellFloatEditor *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - NULL + (char *) "width",(char *) "precision", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_GridCellFloatEditor",kwnames)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatEditor",kwnames,&obj0,&obj1)) goto fail; + if (obj0) { + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + if (obj1) { + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxGridCellFloatEditor *)new wxGridCellFloatEditor(); + result = (wxGridCellFloatEditor *)new wxGridCellFloatEditor(arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3804,7 +3846,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: @@ -3832,7 +3874,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: @@ -4684,7 +4726,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: @@ -4724,7 +4766,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: @@ -4760,6 +4802,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 ; @@ -4812,7 +4880,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: @@ -4880,7 +4948,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: @@ -5149,7 +5217,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: @@ -5344,7 +5412,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: @@ -5401,7 +5469,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: @@ -6420,7 +6488,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: @@ -7235,7 +7303,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: @@ -7510,7 +7578,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: @@ -7962,7 +8030,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO } -static PyObject *_wrap_GridCellCoords_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_GridCellCoords_Get(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; PyObject *result; @@ -7971,12 +8039,12 @@ static PyObject *_wrap_GridCellCoords_asTuple(PyObject *self, PyObject *args, Py (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellCoords_asTuple",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellCoords_Get",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellCoords, SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (PyObject *)wxGridCellCoords_asTuple(arg1); + result = (PyObject *)wxGridCellCoords_Get(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -7998,7 +8066,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 ; @@ -8020,11 +8088,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; @@ -8049,15 +8119,14 @@ 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); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); { if (temp6) delete arg6; @@ -8072,6 +8141,112 @@ 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 = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 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 ; @@ -8278,7 +8453,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: @@ -8776,6 +8951,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj #else PyObject* str = PyObject_Str(item); #endif + if (PyErr_Occurred()) SWIG_fail; arg3->Add(Py2wxString(str)); Py_DECREF(item); Py_DECREF(str); @@ -12908,7 +13084,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: @@ -12944,7 +13120,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: @@ -13038,7 +13214,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: @@ -13074,7 +13250,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: @@ -13965,7 +14141,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: @@ -14001,7 +14177,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: @@ -14037,7 +14213,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) @@ -14081,7 +14257,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) @@ -14150,7 +14326,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: @@ -14178,7 +14354,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: @@ -14206,7 +14382,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: @@ -14234,7 +14410,40 @@ 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: + return NULL; +} + + +static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 = (int) wxWINDOW_VARIANT_NORMAL ; + wxVisualAttributes result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "variant", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Grid_GetClassDefaultAttributes",kwnames,&obj0)) goto fail; + if (obj0) { + arg1 = (wxWindowVariant) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxGrid::GetClassDefaultAttributes((wxWindowVariant )arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxVisualAttributes * resultptr; + resultptr = new wxVisualAttributes((wxVisualAttributes &) result); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxVisualAttributes, 1); } return resultobj; fail: @@ -15324,7 +15533,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: @@ -15546,6 +15755,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 }, @@ -15645,9 +15855,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"GridCellCoords_Set", (PyCFunction) _wrap_GridCellCoords_Set, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellCoords___eq__", (PyCFunction) _wrap_GridCellCoords___eq__, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridCellCoords___ne__", (PyCFunction) _wrap_GridCellCoords___ne__, METH_VARARGS | METH_KEYWORDS }, - { (char *)"GridCellCoords_asTuple", (PyCFunction) _wrap_GridCellCoords_asTuple, METH_VARARGS | METH_KEYWORDS }, + { (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 }, @@ -15835,6 +16047,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Grid_GetGridRowLabelWindow", (PyCFunction) _wrap_Grid_GetGridRowLabelWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_GetGridColLabelWindow", (PyCFunction) _wrap_Grid_GetGridColLabelWindow, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_GetGridCornerLabelWindow", (PyCFunction) _wrap_Grid_GetGridCornerLabelWindow, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Grid_GetClassDefaultAttributes", (PyCFunction) _wrap_Grid_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_swigregister", Grid_swigregister, METH_VARARGS }, { (char *)"new_GridEvent", (PyCFunction) _wrap_new_GridEvent, METH_VARARGS | METH_KEYWORDS }, { (char *)"GridEvent_GetRow", (PyCFunction) _wrap_GridEvent_GetRow, METH_VARARGS | METH_KEYWORDS }, @@ -16921,6 +17134,7 @@ static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0 static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxGridTableMessage[] = {{"_p_wxGridTableMessage", 0, "wxGridTableMessage *", 0, 0, 0, 0},{"_p_wxGridTableMessage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxGrid[] = {{"_p_wxGrid", 0, "wxGrid *", 0, 0, 0, 0},{"_p_wxGrid", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxGrid", _p_wxGridTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxGridSizeEvent", _p_wxGridSizeEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxGridRangeSelectEvent", _p_wxGridRangeSelectEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxGridEvent", _p_wxGridEventTo_p_wxNotifyEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -16975,6 +17189,7 @@ _swigt__p_wxColour, _swigt__p_wxDC, _swigt__p_wxGridTableMessage, _swigt__p_wxGrid, +_swigt__p_wxVisualAttributes, _swigt__p_char, _swigt__p_wxPanel, _swigt__p_wxNotifyEvent, @@ -17068,6 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime")); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH)); + PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE)); + PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH)); PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any)); PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default)); PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell));