X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a66212dcdf3f4b2d4e2b1d1dc45f2ff35bd51bfd..2421eb827857325ff4886131c337391365986d6b:/wxPython/src/grid.i diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index c833668cef..cebed93efa 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// // Name: grid.i // Purpose: SWIG definitions for the new wxGrid and related classes // @@ -12,46 +12,38 @@ %module grid -#ifndef OLD_GRID - %{ -#include "wxPython.h" +#include "wx/wxPython/wxPython.h" +#include "wx/wxPython/pyclasses.h" +#include "wx/wxPython/printfw.h" + #include #include + %} -//---------------------------------------------------------------------- -%include typemaps.i -%include my_typemaps.i +//--------------------------------------------------------------------------- -// Import some definitions of other classes, etc. -%import _defs.i -%import misc.i -%import gdi.i %import windows.i -%import controls.i -%import events.i +%pythoncode { wx = core } -%pragma(python) code = "import wx" -//---------------------------------------------------------------------- +%include _grid_rename.i + +MAKE_CONST_WXSTRING_NOSWIG(EmptyString); +MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr); +MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c")); -%{ - // Put some wx default wxChar* values into wxStrings. - DECLARE_DEF_STRING(PanelNameStr); - DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c")); - static const wxString wxPyEmptyString(wxT("")); -%} //--------------------------------------------------------------------------- // OOR related typemaps and helper functions -%typemap(python, out) wxGridCellRenderer* { $target = wxPyMake_wxGridCellRenderer($source); } -%typemap(python, out) wxGridCellEditor* { $target = wxPyMake_wxGridCellEditor($source); } -%typemap(python, out) wxGridCellAttr* { $target = wxPyMake_wxGridCellAttr($source); } -%typemap(python, out) wxGridCellAttrProvider* { $target = wxPyMake_wxGridCellAttrProvider($source); } -%typemap(python, out) wxGridTableBase* { $target = wxPyMake_wxGridTableBase($source); } +%typemap(out) wxGridCellRenderer* { $result = wxPyMake_wxGridCellRenderer($1); } +%typemap(out) wxGridCellEditor* { $result = wxPyMake_wxGridCellEditor($1); } +%typemap(out) wxGridCellAttr* { $result = wxPyMake_wxGridCellAttr($1); } +%typemap(out) wxGridCellAttrProvider* { $result = wxPyMake_wxGridCellAttrProvider($1); } +%typemap(out) wxGridTableBase* { $result = wxPyMake_wxGridTableBase($1); } %{ @@ -70,7 +62,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, #TYPE, FALSE); \ + target = wxPyConstructObject(source, wxT(#TYPE), False); \ if (target) \ source->SetClientObject(new wxPyOORClientData(target)); \ } \ @@ -107,7 +99,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxGridCellAttr* ptr; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \ if (ro) { \ - if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellAttr_p")) \ + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \ rval = ptr; \ Py_DECREF(ro); \ } \ @@ -241,7 +233,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool rval = 0; \ bool found; \ wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(c); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ Py_DECREF(s); \ @@ -398,7 +390,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) void CBNAME(int a, const wxString& c) { \ bool found; \ wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(c); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \ Py_DECREF(s); \ @@ -517,10 +509,10 @@ class wxGridCellAttr; #define wxGRID_VALUE_DATETIME "datetime" -%readonly -wxGridCellCoords wxGridNoCellCoords; -wxRect wxGridNoCellRect; -%readwrite +%immutable; +const wxGridCellCoords wxGridNoCellCoords; +const wxRect wxGridNoCellRect; +%mutable; //--------------------------------------------------------------------------- @@ -531,7 +523,7 @@ wxRect wxGridNoCellRect; class wxGridCellRenderer { public: - %addmethods { + %extend { void _setOORInfo(PyObject* _self) { self->SetClientObject(new wxPyOORClientData(_self)); } @@ -546,12 +538,12 @@ public: wxDC& dc, const wxRect& rect, int row, int col, - bool isSelected) = 0; + bool isSelected); virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col) = 0; - virtual wxGridCellRenderer *Clone() const = 0; + int row, int col); + virtual wxGridCellRenderer *Clone() const; }; @@ -571,7 +563,7 @@ public: PyObject* go = wxPyMake_wxObject(&grid); PyObject* dco = wxPyMake_wxObject(&dc); PyObject* ao = wxPyMake_wxGridCellAttr(&attr); - PyObject* ro = wxPyConstructObject((void*)&rect, "wxRect", 0); + PyObject* ro = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro, row, col, isSelected)); @@ -603,7 +595,7 @@ public: if (ro) { const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object."; - if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) { + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxSize"))) { rval = *ptr; } else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { @@ -635,7 +627,7 @@ public: wxGridCellRenderer* ptr; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); if (ro) { - if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellRenderer_p")) + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellRenderer"))) rval = ptr; Py_DECREF(ro); } @@ -657,10 +649,10 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters) // Let SWIG know about it so it can create the Python version class wxPyGridCellRenderer : public wxGridCellRenderer { public: + %addtofunc wxPyGridCellRenderer "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)" + wxPyGridCellRenderer(); void _setCallbackInfo(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)" - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void base_SetParameters(const wxString& params); }; @@ -671,24 +663,24 @@ public: class wxGridCellStringRenderer : public wxGridCellRenderer { public: + %addtofunc wxGridCellStringRenderer "self._setOORInfo(self)" wxGridCellStringRenderer(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; class wxGridCellNumberRenderer : public wxGridCellStringRenderer { public: + %addtofunc wxGridCellNumberRenderer "self._setOORInfo(self)" wxGridCellNumberRenderer(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; class wxGridCellFloatRenderer : public wxGridCellStringRenderer { public: + %addtofunc wxGridCellFloatRenderer "self._setOORInfo(self)" wxGridCellFloatRenderer(int width = -1, int precision = -1); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" int GetWidth() const; void SetWidth(int width); @@ -700,33 +692,33 @@ public: class wxGridCellBoolRenderer : public wxGridCellRenderer { public: + %addtofunc wxGridCellBoolRenderer "self._setOORInfo(self)" wxGridCellBoolRenderer(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer { public: + %addtofunc wxGridCellDateTimeRenderer "self._setOORInfo(self)" wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr, wxString informat = wxPyDateTimeFormatStr); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; class wxGridCellEnumRenderer : public wxGridCellStringRenderer { public: + %addtofunc wxGridCellEnumRenderer "self._setOORInfo(self)" wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString ); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer { public: + %addtofunc wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)" wxGridCellAutoWrapStringRenderer(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; @@ -737,7 +729,7 @@ public: class wxGridCellEditor { public: - %addmethods { + %extend { void _setOORInfo(PyObject* _self) { self->SetClientObject(new wxPyOORClientData(_self)); } @@ -747,17 +739,20 @@ public: wxControl* GetControl(); void SetControl(wxControl* control); + wxGridCellAttr* GetCellAttr(); + void SetCellAttr(wxGridCellAttr* attr); + void SetParameters(const wxString& params); void IncRef(); void DecRef(); virtual void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler) = 0; - virtual void BeginEdit(int row, int col, wxGrid* grid) = 0; - virtual bool EndEdit(int row, int col, wxGrid* grid) = 0; - virtual void Reset() = 0; - virtual wxGridCellEditor *Clone() const = 0; + wxEvtHandler* evtHandler); + virtual void BeginEdit(int row, int col, wxGrid* grid); + virtual bool EndEdit(int row, int col, wxGrid* grid); + virtual void Reset(); + virtual wxGridCellEditor *Clone() const; virtual void SetSize(const wxRect& rect); virtual void Show(bool show, wxGridCellAttr *attr = NULL); @@ -804,7 +799,7 @@ public: bool EndEdit(int row, int col, wxGrid* grid) { - bool rv = FALSE; + bool rv = False; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "EndEdit")) { PyObject* go = wxPyMake_wxObject(grid); @@ -816,7 +811,7 @@ public: } - wxGridCellEditor*Clone() const { + wxGridCellEditor* Clone() const { wxGridCellEditor* rval = NULL; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Clone")) { @@ -824,7 +819,7 @@ public: wxGridCellEditor* ptr; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); if (ro) { - if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxGridCellEditor_p")) + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellEditor"))) rval = ptr; Py_DECREF(ro); } @@ -856,7 +851,7 @@ public: wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { PyObject* ao = wxPyMake_wxGridCellAttr(attr); - PyObject* ro = wxPyConstructObject((void*)&rectCell, "wxRect", 0); + PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao)); @@ -880,6 +875,7 @@ public: DEC_PYCALLBACK__(StartingClick); DEC_PYCALLBACK__(Destroy); DEC_PYCALLBACK__STRING(SetParameters); + DEC_PYCALLBACK_STRING__constpure(GetValue); PYPRIVATE; }; @@ -893,6 +889,7 @@ IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, StartingKey, wxKeyEven IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent); IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick); IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy); +IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue); %} @@ -900,15 +897,15 @@ IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, Destroy); // Let SWIG know about it so it can create the Python version class wxPyGridCellEditor : public wxGridCellEditor { public: + %addtofunc wxPyGridCellEditor "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)" + wxPyGridCellEditor(); void _setCallbackInfo(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)" - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void base_SetSize(const wxRect& rect); void base_Show(bool show, wxGridCellAttr *attr = NULL); void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr); - void base_IsAcceptedKey(wxKeyEvent& event); + bool base_IsAcceptedKey(wxKeyEvent& event); void base_StartingKey(wxKeyEvent& event); void base_StartingClick(); void base_HandleReturn(wxKeyEvent& event); @@ -922,57 +919,64 @@ public: class wxGridCellTextEditor : public wxGridCellEditor { public: + %addtofunc wxGridCellTextEditor "self._setOORInfo(self)" wxGridCellTextEditor(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellNumberEditor : public wxGridCellTextEditor { public: + %addtofunc wxGridCellNumberEditor "self._setOORInfo(self)" wxGridCellNumberEditor(int min = -1, int max = -1); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellFloatEditor : public wxGridCellTextEditor { public: + %addtofunc wxGridCellFloatEditor "self._setOORInfo(self)" wxGridCellFloatEditor(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellBoolEditor : public wxGridCellEditor { public: + %addtofunc wxGridCellBoolEditor "self._setOORInfo(self)" wxGridCellBoolEditor(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellChoiceEditor : public wxGridCellEditor { public: - wxGridCellChoiceEditor(int LCOUNT = 0, - const wxString* choices = NULL, - bool allowOthers = FALSE); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %addtofunc wxGridCellChoiceEditor "self._setOORInfo(self)" + wxGridCellChoiceEditor(int choices = 0, + const wxString* choices_array = NULL, + bool allowOthers = False); + virtual wxString GetValue(); }; class wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: + %addtofunc wxGridCellEnumEditor "self._setOORInfo(self)" wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString ); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor { public: + %addtofunc wxGridCellAutoWrapStringEditor "self._setOORInfo(self)" wxGridCellAutoWrapStringEditor(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -993,14 +997,15 @@ public: Merged }; - %addmethods { + %extend { void _setOORInfo(PyObject* _self) { self->SetClientObject(new wxPyOORClientData(_self)); } } + + %addtofunc wxGridCellAttr "self._setOORInfo(self)" wxGridCellAttr(wxGridCellAttr *attrDefault = NULL); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" wxGridCellAttr *Clone() const; void MergeWith(wxGridCellAttr *mergefrom); @@ -1010,7 +1015,9 @@ public: void SetBackgroundColour(const wxColour& colBack); void SetFont(const wxFont& font); void SetAlignment(int hAlign, int vAlign); - void SetReadOnly(bool isReadOnly = TRUE); + void SetSize(int num_rows, int num_cols); + void SetOverflow( bool allow = True ); + void SetReadOnly(bool isReadOnly = True); void SetRenderer(wxGridCellRenderer *renderer); void SetEditor(wxGridCellEditor* editor); @@ -1023,11 +1030,21 @@ public: bool HasRenderer() const; bool HasEditor() const; bool HasReadWriteMode() const; + bool HasOverflowMode() const; wxColour GetTextColour() const; wxColour GetBackgroundColour() const; wxFont GetFont() const; - void GetAlignment(int *OUTPUT, int *OUTPUT) const; + + DocDeclA( + void, GetAlignment(int *OUTPUT, int *OUTPUT) const, + "GetAlignment() -> (hAlign, vAlign)"); + + DocDeclA( + void, GetSize(int *OUTPUT, int *OUTPUT) const, + "GetSize() -> (num_rows, num_cols)"); + + bool GetOverflow() const; wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const; wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const; @@ -1040,11 +1057,11 @@ public: class wxGridCellAttrProvider { public: + %addtofunc wxGridCellAttrProvider "self._setOORInfo(self)" wxGridCellAttrProvider(); // ???? virtual ~wxGridCellAttrProvider(); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %addmethods { + %extend { void _setOORInfo(PyObject* _self) { self->SetClientObject(new wxPyOORClientData(_self)); } @@ -1083,9 +1100,9 @@ public: class wxPyGridCellAttrProvider : public wxGridCellAttrProvider { public: + %addtofunc wxPyGridCellAttrProvider "self._setCallbackInfo(self, PyGridCellAttrProvider)" wxPyGridCellAttrProvider(); void _setCallbackInfo(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellAttrProvider)" wxGridCellAttr *base_GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind); @@ -1105,7 +1122,7 @@ public: // wxGridTableBase(); This is an ABC //~wxGridTableBase(); - %addmethods { + %extend { void _setOORInfo(PyObject* _self) { self->SetClientObject(new wxPyOORClientData(_self)); } @@ -1118,11 +1135,11 @@ public: // pure virtuals - virtual int GetNumberRows() = 0; - virtual int GetNumberCols() = 0; - virtual bool IsEmptyCell( int row, int col ) = 0; - virtual wxString GetValue( int row, int col ) = 0; - virtual void SetValue( int row, int col, const wxString& value ) = 0; + virtual int GetNumberRows(); + virtual int GetNumberCols(); + virtual bool IsEmptyCell( int row, int col ); + virtual wxString GetValue( int row, int col ); + virtual void SetValue( int row, int col, const wxString& value ); // virtuals overridable in wxPyGridTableBase virtual wxString GetTypeName( int row, int col ); @@ -1297,12 +1314,11 @@ public: class wxPyGridTableBase : public wxGridTableBase { public: + %addtofunc wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)" wxPyGridTableBase(); void _setCallbackInfo(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)" - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - %addmethods { void Destroy() { delete self; } } + %extend { void Destroy() { delete self; } } wxString base_GetTypeName( int row, int col ); bool base_CanGetValueAs( int row, int col, const wxString& typeName ); @@ -1333,8 +1349,8 @@ public: class wxGridStringTable : public wxGridTableBase { public: + %addtofunc wxGridStringTable "self._setOORInfo(self)" wxGridStringTable( int numRows=0, int numCols=0 ); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" }; //--------------------------------------------------------------------------- @@ -1375,64 +1391,127 @@ public: //--------------------------------------------------------------------------- + class wxGridCellCoords { public: wxGridCellCoords( int r=-1, int c=-1 ); ~wxGridCellCoords(); - int GetRow() const { return m_row; } - void SetRow( int n ) { m_row = n; } - int GetCol() const { return m_col; } - void SetCol( int n ) { m_col = n; } - void Set( int row, int col ) { m_row = row; m_col = col; } + int GetRow() const; + void SetRow( int n ); + int GetCol() const; + void SetCol( int n ); + void Set( int row, int col ); + + bool operator==( const wxGridCellCoords& other ) const; + bool operator!=( const wxGridCellCoords& other ) const; - %addmethods { + %extend { PyObject* asTuple() { 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; } - - int __cmp__( const wxGridCellCoords& other ) { - return *self != other; - } } - %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())" - %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())" + %pythoncode { + def __str__(self): return str(self.asTuple()) + def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple()) + def __len__(self): return len(self.asTuple()) + def __getitem__(self, index): return self.asTuple()[index] + def __setitem__(self, index, val): + if index == 0: self.SetRow(val) + elif index == 1: self.SetCol(val) + else: raise IndexError + } + }; // Typemap to allow conversion of sequence objects to wxGridCellCoords... -%typemap(python,in) wxGridCellCoords& (wxGridCellCoords temp) { - $target = &temp; - if (! wxGridCellCoords_helper($source, &$target)) - return NULL; +%typemap(in) wxGridCellCoords& (wxGridCellCoords temp) { + $1 = &temp; + if (! wxGridCellCoords_helper($input, &$1)) SWIG_fail; +} +%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxGridCellCoords& { + $1 = wxGridCellCoords_typecheck($input); } + // ...and here is the associated helper. %{ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { // If source is an object instance then it may already be the right type - if (PyInstance_Check(source)) { + if (wxPySwigInstance_Check(source)) { wxGridCellCoords* ptr; - if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxGridCellCoords_p")) + if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords"))) goto error; *obj = ptr; - return TRUE; + return True; } // otherwise a 2-tuple of integers is expected else if (PySequence_Check(source) && PyObject_Length(source) == 2) { PyObject* o1 = PySequence_GetItem(source, 0); PyObject* o2 = PySequence_GetItem(source, 1); + if (!PyNumber_Check(o1) || !PyNumber_Check(o2)) { + Py_DECREF(o1); + Py_DECREF(o2); + goto error; + } **obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2)); - return TRUE; + Py_DECREF(o1); + Py_DECREF(o2); + return True; } error: PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object."); - return FALSE; + return False; +} + + +bool wxGridCellCoords_typecheck(PyObject* source) { + void* ptr; + + if (wxPySwigInstance_Check(source) && + wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords"))) + return True; + + PyErr_Clear(); + if (PySequence_Check(source) && PySequence_Length(source) == 2) + return True; + + return False; +} +%} + + +// Typemap to convert an array of cells coords to a list of tuples... +%typemap(out) wxGridCellCoordsArray { + $result = wxGridCellCoordsArray_helper($1); +} + +// %typemap(ret) wxGridCellCoordsArray { +// delete $1; +// } + + +// ...and the helper function for the above typemap. +%{ +PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source) +{ + PyObject* list = PyList_New(0); + size_t idx; + for (idx = 0; idx < source.GetCount(); idx += 1) { + wxGridCellCoords& coord = source.Item(idx); + PyObject* tup = PyTuple_New(2); + PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(coord.GetRow())); + PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(coord.GetCol())); + PyList_Append(list, tup); + Py_DECREF(tup); + } + return list; } %} @@ -1454,6 +1533,8 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES; class wxGrid : public wxScrolledWindow { public: + %addtofunc wxGrid "self._setOORInfo(self)" + wxGrid( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -1461,15 +1542,22 @@ public: long style = wxWANTS_CHARS, const wxString& name = wxPyPanelNameStr); - %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" - enum wxGridSelectionModes {wxGridSelectCells, - wxGridSelectRows, - wxGridSelectColumns}; + enum wxGridSelectionModes { + wxGridSelectCells, + wxGridSelectRows, + wxGridSelectColumns + }; + %pythoncode { + SelectCells = wxGridSelectCells + SelectRows = wxGridSelectRows + SelectColumns = wxGridSelectColumns, + } bool CreateGrid( int numRows, int numCols, WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells ); void SetSelectionMode(WXGRIDSELECTIONMODES selmode); + WXGRIDSELECTIONMODES GetSelectionMode(); // ------ grid dimensions @@ -1482,17 +1570,17 @@ public: wxGridTableBase * GetTable() const; - bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE, + bool SetTable( wxGridTableBase *table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells ); void ClearGrid(); - bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE ); - bool AppendRows( int numRows = 1, bool updateLabels=TRUE ); - bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE ); - bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE ); - bool AppendCols( int numCols = 1, bool updateLabels=TRUE ); - bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE ); + bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=True ); + bool AppendRows( int numRows = 1, bool updateLabels=True ); + bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=True ); + bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=True ); + bool AppendCols( int numCols = 1, bool updateLabels=True ); + bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=True ); // this function is called when the current cell highlight must be redrawn @@ -1504,16 +1592,18 @@ public: // void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&, int horizontalAlignment = wxLEFT, - int verticalAlignment = wxTOP ); + int verticalAlignment = wxTOP, + int textOrientation = wxHORIZONTAL ); // // Split a string containing newline chararcters into an array of // // strings and return the number of lines // // // void StringToLines( const wxString& value, wxArrayString& lines ); - void GetTextBoxSize( wxDC& dc, - wxArrayString& lines, - long *OUTPUT, long *OUTPUT ); + DocDeclA( + void, GetTextBoxSize( wxDC& dc, wxArrayString& lines, + long *OUTPUT, long *OUTPUT ), + "GetTextBoxSize(DC dc, list lines) -> (width, height)"); // ------ @@ -1525,14 +1615,15 @@ public: void EndBatch(); int GetBatchCount(); void ForceRefresh(); + void Refresh(bool eraseb=True, const wxRect* rect= NULL); // ------ edit control functions // - bool IsEditable() { return m_editable; } + bool IsEditable(); void EnableEditing( bool edit ); - void EnableCellEditControl( bool enable = TRUE ); + void EnableCellEditControl( bool enable = True ); void DisableCellEditControl(); bool CanEnableCellControl() const; bool IsCellEditControlEnabled() const; @@ -1552,11 +1643,11 @@ public: // //void XYToCell( int x, int y, wxGridCellCoords& ); - %addmethods { - %new wxGridCellCoords* XYToCell(int x, int y) { + %extend { + wxGridCellCoords XYToCell(int x, int y) { wxGridCellCoords rv; self->XYToCell(x, y, rv); - return new wxGridCellCoords(rv); + return rv; } } @@ -1576,8 +1667,8 @@ public: // check to see if a cell is either wholly visible (the default arg) or // at least partially visible in the grid window // - bool IsVisible( int row, int col, bool wholeCellVisible = TRUE ); - // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = TRUE ); + bool IsVisible( int row, int col, bool wholeCellVisible = True ); + // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = True ); void MakeCellVisible( int row, int col ); // TODO: ??? void MakeCellVisible( const wxGridCellCoords& coords ); @@ -1606,8 +1697,16 @@ public: wxColour GetLabelBackgroundColour(); wxColour GetLabelTextColour(); wxFont GetLabelFont(); - void GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ); - void GetColLabelAlignment( int *OUTPUT, int *OUTPUT ); + + DocDeclA( + void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ), + "GetRowLabelAlignment() -> (horiz, vert)"); + + DocDeclA( + void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ), + "GetColLabelAlignment() -> (horiz, vert)"); + + int GetColLabelTextOrientation(); wxString GetRowLabelValue( int row ); wxString GetColLabelValue( int col ); wxColour GetGridLineColour(); @@ -1622,6 +1721,7 @@ public: void SetLabelFont( const wxFont& ); void SetRowLabelAlignment( int horiz, int vert ); void SetColLabelAlignment( int horiz, int vert ); + void SetColLabelTextOrientation( int textOrientation ); void SetRowLabelValue( int row, const wxString& ); void SetColLabelValue( int col, const wxString& ); void SetGridLineColour( const wxColour& ); @@ -1629,17 +1729,18 @@ public: void SetCellHighlightPenWidth(int width); void SetCellHighlightROPenWidth(int width); - void EnableDragRowSize( bool enable = TRUE ); + void EnableDragRowSize( bool enable = True ); void DisableDragRowSize(); bool CanDragRowSize(); - void EnableDragColSize( bool enable = TRUE ); + void EnableDragColSize( bool enable = True ); void DisableDragColSize(); bool CanDragColSize(); - void EnableDragGridSize(bool enable = TRUE); + void EnableDragGridSize(bool enable = True); void DisableDragGridSize(); bool CanDragGridSize(); // this sets the specified attribute for all cells in this row/col + void SetAttr(int row, int col, wxGridCellAttr *attr); void SetRowAttr(int row, wxGridCellAttr *attr); void SetColAttr(int col, wxGridCellAttr *attr); @@ -1651,7 +1752,7 @@ public: void SetColFormatFloat(int col, int width = -1, int precision = -1); void SetColFormatCustom(int col, const wxString& typeName); - void EnableGridLines( bool enable = TRUE ); + void EnableGridLines( bool enable = True ); bool GridLinesEnabled(); // ------ row and col formatting @@ -1666,36 +1767,61 @@ public: wxColour GetCellTextColour( int row, int col ); wxFont GetDefaultCellFont(); wxFont GetCellFont( int row, int col ); - void GetDefaultCellAlignment( int *horiz, int *vert ); - void GetCellAlignment( int row, int col, int *horiz, int *vert ); - void SetDefaultRowSize( int height, bool resizeExistingRows = FALSE ); + DocDeclA( + void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ), + "GetDefaultCellAlignment() -> (horiz, vert)"); + + DocDeclA( + void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ), + "GetCellAlignment() -> (horiz, vert)"); + + bool GetDefaultCellOverflow(); + bool GetCellOverflow( int row, int col ); + + DocDeclA( + void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ), + "GetCellSize(int row, int col) -> (num_rows, num_cols)"); + + void SetDefaultRowSize( int height, bool resizeExistingRows = False ); void SetRowSize( int row, int height ); - void SetDefaultColSize( int width, bool resizeExistingCols = FALSE ); + void SetDefaultColSize( int width, bool resizeExistingCols = False ); void SetColSize( int col, int width ); // automatically size the column or row to fit to its contents, if - // setAsMin is TRUE, this optimal width will also be set as minimal width + // setAsMin is True, this optimal width will also be set as minimal width // for this column - void AutoSizeColumn( int col, bool setAsMin = TRUE ); - void AutoSizeRow( int row, bool setAsMin = TRUE ); + void AutoSizeColumn( int col, bool setAsMin = True ); + void AutoSizeRow( int row, bool setAsMin = True ); // auto size all columns (very ineffective for big grids!) - void AutoSizeColumns( bool setAsMin = TRUE ); - void AutoSizeRows( bool setAsMin = TRUE ); + void AutoSizeColumns( bool setAsMin = True ); + void AutoSizeRows( bool setAsMin = True ); // auto size the grid, that is make the columns/rows of the "right" size // and also set the grid size to just fit its contents void AutoSize(); + // autosize row height depending on label text + void AutoSizeRowLabelSize( int row ); + + // autosize column width depending on label text + void AutoSizeColLabelSize( int col ); + + // column won't be resized to be lesser width - this must be called during // the grid creation because it won't resize the column if it's already // narrower than the minimal width void SetColMinimalWidth( int col, int width ); void SetRowMinimalHeight( int row, int width ); + void SetColMinimalAcceptableWidth( int width ); + void SetRowMinimalAcceptableHeight( int width ); + int GetColMinimalAcceptableWidth() const; + int GetRowMinimalAcceptableHeight() const; + void SetDefaultCellBackgroundColour( const wxColour& ); void SetCellBackgroundColour( int row, int col, const wxColour& ); void SetDefaultCellTextColour( const wxColour& ); @@ -1705,6 +1831,9 @@ public: void SetCellFont( int row, int col, const wxFont& ); void SetDefaultCellAlignment( int horiz, int vert ); void SetCellAlignment( int row, int col, int horiz, int vert ); + void SetDefaultCellOverflow( bool allow ); + void SetCellOverflow( int row, int col, bool allow ); + void SetCellSize( int row, int col, int num_rows, int num_cols ); // takes ownership of the pointer void SetDefaultRenderer(wxGridCellRenderer *renderer); @@ -1728,19 +1857,19 @@ public: void SetCellValue( int row, int col, const wxString& s ); // TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s ) - // returns TRUE if the cell can't be edited + // returns True if the cell can't be edited bool IsReadOnly(int row, int col) const; // make the cell editable/readonly - void SetReadOnly(int row, int col, bool isReadOnly = TRUE); + void SetReadOnly(int row, int col, bool isReadOnly = True); // ------ selections of blocks of cells // - void SelectRow( int row, bool addToSelected = FALSE ); - void SelectCol( int col, bool addToSelected = FALSE ); + void SelectRow( int row, bool addToSelected = False ); + void SelectCol( int col, bool addToSelected = False ); void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, - bool addToSelected = FALSE ); + bool addToSelected = False ); // TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft, // TODO: ??? const wxGridCellCoords& bottomRight ) @@ -1750,6 +1879,16 @@ public: bool IsInSelection( int row, int col ); // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords ) + const wxGridCellCoordsArray GetSelectedCells() const; + const wxGridCellCoordsArray GetSelectionBlockTopLeft() const; + const wxGridCellCoordsArray GetSelectionBlockBottomRight() const; + const wxArrayInt GetSelectedRows() const; + const wxArrayInt GetSelectedCols() const; + + void DeselectRow( int row ); + void DeselectCol( int col ); + void DeselectCell( int row, int col ); + // This function returns the rectangle that encloses the block of cells // limited by TopLeft and BottomRight cell in device coords and clipped @@ -1802,8 +1941,8 @@ class wxGridEvent : public wxNotifyEvent { public: wxGridEvent(int id, wxEventType type, wxGrid* obj, - int row=-1, int col=-1, int x=-1, int y=-1, bool sel = TRUE, - bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE); + int row=-1, int col=-1, int x=-1, int y=-1, bool sel = True, + bool control=False, bool shift=False, bool alt=False, bool meta=False); virtual int GetRow(); virtual int GetCol(); @@ -1822,7 +1961,7 @@ class wxGridSizeEvent : public wxNotifyEvent public: wxGridSizeEvent(int id, wxEventType type, wxGrid* obj, int rowOrCol=-1, int x=-1, int y=-1, - bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE); + bool control=False, bool shift=False, bool alt=False, bool meta=False); int GetRowOrCol(); wxPoint GetPosition(); @@ -1840,9 +1979,9 @@ public: wxGridRangeSelectEvent(int id, wxEventType type, wxGrid* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, - bool sel = TRUE, - bool control=FALSE, bool shift=FALSE, - bool alt=FALSE, bool meta=FALSE); + bool sel = True, + bool control=False, bool shift=False, + bool alt=False, bool meta=False); wxGridCellCoords GetTopLeftCoords(); wxGridCellCoords GetBottomRightCoords(); @@ -1873,90 +2012,49 @@ public: -enum { - wxEVT_GRID_CELL_LEFT_CLICK, - wxEVT_GRID_CELL_RIGHT_CLICK, - wxEVT_GRID_CELL_LEFT_DCLICK, - wxEVT_GRID_CELL_RIGHT_DCLICK, - wxEVT_GRID_LABEL_LEFT_CLICK, - wxEVT_GRID_LABEL_RIGHT_CLICK, - wxEVT_GRID_LABEL_LEFT_DCLICK, - wxEVT_GRID_LABEL_RIGHT_DCLICK, - wxEVT_GRID_ROW_SIZE, - wxEVT_GRID_COL_SIZE, - wxEVT_GRID_RANGE_SELECT, - wxEVT_GRID_CELL_CHANGE, - wxEVT_GRID_SELECT_CELL, - wxEVT_GRID_EDITOR_SHOWN, - wxEVT_GRID_EDITOR_HIDDEN, - wxEVT_GRID_EDITOR_CREATED, -}; - - - -%pragma(python) code = " -def EVT_GRID_CELL_LEFT_CLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_CLICK, fn) - -def EVT_GRID_CELL_RIGHT_CLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_CLICK, fn) - -def EVT_GRID_CELL_LEFT_DCLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_CELL_LEFT_DCLICK, fn) - -def EVT_GRID_CELL_RIGHT_DCLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_CELL_RIGHT_DCLICK, fn) - -def EVT_GRID_LABEL_LEFT_CLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_CLICK, fn) - -def EVT_GRID_LABEL_RIGHT_CLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_CLICK, fn) - -def EVT_GRID_LABEL_LEFT_DCLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_LABEL_LEFT_DCLICK, fn) - -def EVT_GRID_LABEL_RIGHT_DCLICK(win, fn): - win.Connect(-1, -1, wxEVT_GRID_LABEL_RIGHT_DCLICK, fn) - -def EVT_GRID_ROW_SIZE(win, fn): - win.Connect(-1, -1, wxEVT_GRID_ROW_SIZE, fn) - -def EVT_GRID_COL_SIZE(win, fn): - win.Connect(-1, -1, wxEVT_GRID_COL_SIZE, fn) - -def EVT_GRID_RANGE_SELECT(win, fn): - win.Connect(-1, -1, wxEVT_GRID_RANGE_SELECT, fn) - -def EVT_GRID_CELL_CHANGE(win, fn): - win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn) - -def EVT_GRID_SELECT_CELL(win, fn): - win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn) - -def EVT_GRID_EDITOR_SHOWN(win, fn): - win.Connect(-1, -1, wxEVT_GRID_EDITOR_SHOWN, fn) - -def EVT_GRID_EDITOR_HIDDEN(win, fn): - win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn) - -def EVT_GRID_EDITOR_CREATED(win, fn): - win.Connect(-1, -1, wxEVT_GRID_EDITOR_CREATED, fn) - -" +%constant wxEventType wxEVT_GRID_CELL_LEFT_CLICK; +%constant wxEventType wxEVT_GRID_CELL_RIGHT_CLICK; +%constant wxEventType wxEVT_GRID_CELL_LEFT_DCLICK; +%constant wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK; +%constant wxEventType wxEVT_GRID_LABEL_LEFT_CLICK; +%constant wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK; +%constant wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK; +%constant wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK; +%constant wxEventType wxEVT_GRID_ROW_SIZE; +%constant wxEventType wxEVT_GRID_COL_SIZE; +%constant wxEventType wxEVT_GRID_RANGE_SELECT; +%constant wxEventType wxEVT_GRID_CELL_CHANGE; +%constant wxEventType wxEVT_GRID_SELECT_CELL; +%constant wxEventType wxEVT_GRID_EDITOR_SHOWN; +%constant wxEventType wxEVT_GRID_EDITOR_HIDDEN; +%constant wxEventType wxEVT_GRID_EDITOR_CREATED; + + + +%pythoncode { +EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK ) +EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK ) +EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK ) +EVT_GRID_CELL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_DCLICK ) +EVT_GRID_LABEL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_CLICK ) +EVT_GRID_LABEL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_CLICK ) +EVT_GRID_LABEL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_LEFT_DCLICK ) +EVT_GRID_LABEL_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_GRID_LABEL_RIGHT_DCLICK ) +EVT_GRID_ROW_SIZE = wx.PyEventBinder( wxEVT_GRID_ROW_SIZE ) +EVT_GRID_COL_SIZE = wx.PyEventBinder( wxEVT_GRID_COL_SIZE ) +EVT_GRID_RANGE_SELECT = wx.PyEventBinder( wxEVT_GRID_RANGE_SELECT ) +EVT_GRID_CELL_CHANGE = wx.PyEventBinder( wxEVT_GRID_CELL_CHANGE ) +EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL ) +EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN ) +EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN ) +EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED ) +} //--------------------------------------------------------------------------- %init %{ - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); %} //--------------------------------------------------------------------------- - -%pragma(python) include="_gridextras.py"; - //--------------------------------------------------------------------------- - -#endif