X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/994141e6cd947341b7075e46616ffb5423600892..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/src/gtk/grid_wrap.cpp diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index 8a5ace1a6c..64acd7f162 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -899,15 +899,6 @@ void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - class wxPyGridCellEditor : public wxGridCellEditor { public: @@ -1232,15 +1223,14 @@ public: }; void wxPyGridTableBase_Destroy(wxPyGridTableBase *self){ delete self; } -PyObject *wxGridCellCoords_asTuple(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())); - return tup; - } bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { + if (source == Py_None) { + **obj = wxGridCellCoords(-1,-1); + return True; + } + // If source is an object instance then it may already be the right type if (wxPySwigInstance_Check(source)) { wxGridCellCoords* ptr; @@ -1300,6 +1290,12 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source) return list; } +PyObject *wxGridCellCoords_asTuple(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())); + return tup; + } typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES; @@ -2146,7 +2142,7 @@ static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2457,7 +2453,7 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2639,7 +2635,7 @@ static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2937,7 +2933,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4066,7 +4062,7 @@ static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4091,7 +4087,7 @@ static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4116,7 +4112,7 @@ static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4141,7 +4137,7 @@ static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4166,7 +4162,7 @@ static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4191,7 +4187,7 @@ static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4216,7 +4212,7 @@ static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4241,7 +4237,7 @@ static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4429,7 +4425,7 @@ static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4538,7 +4534,7 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5283,7 +5279,7 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5466,7 +5462,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -5519,7 +5515,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -5638,7 +5634,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5829,7 +5825,7 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5862,7 +5858,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5903,7 +5899,7 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5944,7 +5940,7 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5977,7 +5973,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6018,7 +6014,7 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6209,7 +6205,7 @@ static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6530,7 +6526,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -6583,7 +6579,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -6656,7 +6652,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6689,7 +6685,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6730,7 +6726,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6771,7 +6767,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6804,7 +6800,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6845,7 +6841,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7036,7 +7032,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7755,6 +7751,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; wxGridCellCoords *arg2 = 0 ; bool result; + wxGridCellCoords temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7763,9 +7760,9 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + arg2 = &temp2; + if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7774,7 +7771,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7786,6 +7783,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ; wxGridCellCoords *arg2 = 0 ; bool result; + wxGridCellCoords temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -7794,9 +7792,9 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxGridCellCoords,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + { + arg2 = &temp2; + if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7805,7 +7803,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7962,7 +7960,7 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8098,7 +8096,7 @@ static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8169,7 +8167,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8242,7 +8240,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8283,7 +8281,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8332,7 +8330,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8381,7 +8379,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8422,7 +8420,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8471,7 +8469,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8595,6 +8593,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj wxArrayString *arg3 = 0 ; long *arg4 = (long *) 0 ; long *arg5 = (long *) 0 ; + bool temp3 = False ; long temp4 ; long temp5 ; PyObject * obj0 = 0 ; @@ -8618,6 +8617,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj SWIG_fail; } arg3 = new wxArrayString; + temp3 = True; int i, len=PySequence_Length(obj2); for (i=0; i