X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8edf1c75f0667d3568e224910fa858cf05234942..fcafa8a99e85911258e8f783a5099894a2322261:/wxPython/src/msw/grid_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index fce03001ec..aa95d6659c 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/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: @@ -2146,7 +2137,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 +2448,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 +2630,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 +2928,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 +4057,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 +4082,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 +4107,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 +4132,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 +4157,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 +4182,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 +4207,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 +4232,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 +4420,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 +4529,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 +5274,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 +5457,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 +5510,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 +5629,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 +5820,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 +5853,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 +5894,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 +5935,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 +5968,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 +6009,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 +6200,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 +6521,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 +6574,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 +6647,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 +6680,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 +6721,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 +6762,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 +6795,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 +6836,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 +7027,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; @@ -7774,7 +7765,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; @@ -7805,7 +7796,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 +7953,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 +8089,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 +8160,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 +8233,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 +8274,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 +8323,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 +8372,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 +8413,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 +8462,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 +8586,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 +8610,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