X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7a014180017908d32f0af32ebfa140fdc82b390..a9a04486a2fc7be11a42343070ff8dd859618c46:/wxPython/src/grid.i diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 3e63084f40..e2c63de53a 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -35,8 +35,6 @@ %pythoncode { __docfilter__ = wx.__DocFilter(globals()) } -%include _grid_rename.i - MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr); MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat); @@ -99,18 +97,18 @@ wxPyMake_TEMPLATE(wxGridTableBase) wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \ wxGridCellAttr* rval = NULL; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxGridCellAttr* ptr; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \ if (ro) { \ - if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \ + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \ rval = ptr; \ Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b, c); \ return rval; \ @@ -119,14 +117,14 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \ void CBNAME(wxGridCellAttr *attr, int a, int b) { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(attr, a, b); \ } @@ -135,14 +133,14 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__GCAINT(PCLASS, CBNAME) \ void CBNAME(wxGridCellAttr *attr, int val) { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(attr, val); \ } @@ -151,11 +149,11 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK_INT__pure(CBNAME) \ int CBNAME() { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ int rval = 0; \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -163,18 +161,18 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \ bool CBNAME(int a, int b) { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ bool rval = 0; \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } #define PYCALLBACK_STRING_INTINT_pure(CBNAME) \ wxString CBNAME(int a, int b) { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ wxString rval; \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ @@ -184,27 +182,27 @@ wxPyMake_TEMPLATE(wxGridTableBase) Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } #define PYCALLBACK__INTINTSTRING_pure(CBNAME) \ void CBNAME(int a, int b, const wxString& c) { \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* s = wx2PyString(c); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ } #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \ wxString CBNAME(int a, int b) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ wxString rval; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ @@ -214,7 +212,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -225,13 +223,13 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool CBNAME(int a, int b, const wxString& c) { \ bool rval = 0; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ 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); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b,c); \ return rval; \ @@ -244,10 +242,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) long CBNAME(int a, int b) { \ long rval; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -258,10 +256,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool CBNAME(int a, int b) { \ bool rval = 0; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -272,7 +270,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \ double CBNAME(int a, int b) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ double rval; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ @@ -283,7 +281,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -294,10 +292,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__(PCLASS, CBNAME) \ void CBNAME() { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ } @@ -308,10 +306,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool CBNAME(size_t a, size_t b) { \ bool rval = 0; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -323,10 +321,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool CBNAME(size_t a) { \ bool rval = 0; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -336,7 +334,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \ wxString CBNAME(int a) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ wxString rval; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ @@ -346,7 +344,7 @@ wxPyMake_TEMPLATE(wxGridTableBase) Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -356,13 +354,13 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \ void CBNAME(int a, const wxString& c) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(c); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,c); \ } @@ -374,10 +372,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) bool CBNAME() { \ bool rval = 0; \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -388,10 +386,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \ void CBNAME(size_t a, int b) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } @@ -402,10 +400,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \ void CBNAME(int a, int b, long c) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ } @@ -416,10 +414,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \ void CBNAME(int a, int b, double c) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ } @@ -429,10 +427,10 @@ wxPyMake_TEMPLATE(wxGridTableBase) #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \ void CBNAME(int a, int b, bool c) { \ bool found; \ - wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ } @@ -491,11 +489,14 @@ enum { //--------------------------------------------------------------------------- -// wxGridCellRenderer is an ABC, and several derived classes are available. -// Classes implemented in Python should be derived from wxPyGridCellRenderer. +// TODO: Use these to have SWIG automatically handle the IncRef/DecRef calls: +// +// %ref wxGridCellWorker "$this->IncRef();"; +// %unref wxGridCellWorker "$this->DecRef();"; +// -class wxGridCellRenderer +class wxGridCellWorker { public: %extend { @@ -503,12 +504,25 @@ public: if (!self->GetClientObject()) self->SetClientObject(new wxPyOORClientData(_self)); } + + // A dummy dtor to shut up SWIG. (The real one is protected and can + // only be called by DecRef) + ~wxGridCellWorker() { + } } void SetParameters(const wxString& params); void IncRef(); void DecRef(); +}; + + + +// wxGridCellRenderer is an ABC, and several derived classes are available. +// Classes implemented in Python should be derived from wxPyGridCellRenderer. +class wxGridCellRenderer : public wxGridCellWorker +{ virtual void Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, @@ -523,6 +537,7 @@ public: }; + // The C++ version of wxPyGridCellRenderer %{ class wxPyGridCellRenderer : public wxGridCellRenderer @@ -703,16 +718,9 @@ public: // wxGridCellEditor is an ABC, and several derived classes are available. // Classes implemented in Python should be derived from wxPyGridCellEditor. -class wxGridCellEditor +class wxGridCellEditor : public wxGridCellWorker { public: - %extend { - void _setOORInfo(PyObject* _self) { - if (!self->GetClientObject()) - self->SetClientObject(new wxPyOORClientData(_self)); - } - } - bool IsCreated(); wxControl* GetControl(); void SetControl(wxControl* control); @@ -720,10 +728,6 @@ public: wxGridCellAttr* GetCellAttr(); void SetCellAttr(wxGridCellAttr* attr); - void SetParameters(const wxString& params); - void IncRef(); - void DecRef(); - virtual void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler); @@ -991,11 +995,20 @@ public: %pythonAppend wxGridCellAttr "self._setOORInfo(self)" wxGridCellAttr(wxGridCellAttr *attrDefault = NULL); + + %extend { + // A dummy dtor to shut up SWIG. (The real one is protected and can + // only be called by DecRef) + ~wxGridCellAttr() { + } + } wxGridCellAttr *Clone() const; void MergeWith(wxGridCellAttr *mergefrom); + void IncRef(); void DecRef(); + void SetTextColour(const wxColour& colText); void SetBackgroundColour(const wxColour& colBack); void SetFont(const wxFont& font); @@ -1092,7 +1105,7 @@ public: void _setCallbackInfo(PyObject* self, PyObject* _class); wxGridCellAttr *GetAttr(int row, int col, - wxGridCellAttr::wxAttrKind kind); + wxGridCellAttr::wxAttrKind kind); void SetAttr(wxGridCellAttr *attr, int row, int col); void SetRowAttr(wxGridCellAttr *attr, int row); void SetColAttr(wxGridCellAttr *attr, int col); @@ -1112,7 +1125,7 @@ class wxGridTableBase : public wxObject { public: // wxGridTableBase(); This is an ABC - //~wxGridTableBase(); + ~wxGridTableBase(); %extend { void _setOORInfo(PyObject* _self) { @@ -1519,8 +1532,33 @@ public: void SetCol( int n ); void Set( int row, int col ); - bool operator==( const wxGridCellCoords& other ) const; - bool operator!=( const wxGridCellCoords& other ) const; + %extend { + KeepGIL(__eq__); + DocStr(__eq__, "Test for equality of GridCellCoords objects.", ""); + bool __eq__(PyObject* other) { + wxGridCellCoords temp, *obj = &temp; + if ( other == Py_None ) return false; + if ( ! wxGridCellCoords_helper(other, &obj) ) { + PyErr_Clear(); + return false; + } + return self->operator==(*obj); + } + + + KeepGIL(__ne__); + DocStr(__ne__, "Test for inequality of GridCellCoords objects.", ""); + bool __ne__(PyObject* other) { + wxGridCellCoords temp, *obj = &temp; + if ( other == Py_None ) return true; + if ( ! wxGridCellCoords_helper(other, &obj)) { + PyErr_Clear(); + return true; + } + return self->operator!=(*obj); + } + } + %extend { PyObject* Get() { @@ -1591,7 +1629,12 @@ public: long style = wxWANTS_CHARS, const wxString& name = wxPyPanelNameStr ); - + // Override the global renamer to leave these as they are, for backwards + // compatibility + %rename(wxGridSelectCells) wxGridSelectCells; + %rename(wxGridSelectRows) wxGridSelectRows; + %rename(wxGridSelectColumns) wxGridSelectColumns; + enum wxGridSelectionModes { wxGridSelectCells, wxGridSelectRows, @@ -1619,9 +1662,12 @@ public: wxGridTableBase * GetTable() const; + + %disownarg(wxGridTableBase *); bool SetTable( wxGridTableBase *table, bool takeOwnership=false, WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells ); + %cleardisown(wxGridTableBase *); void ClearGrid(); bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=true ); @@ -1700,7 +1746,7 @@ public: } int YToRow( int y ); - int XToCol( int x ); + int XToCol( int x, bool clipToMinMax = false ); int YToEdgeOfRow( int y ); int XToEdgeOfCol( int x ); @@ -1783,6 +1829,9 @@ public: void EnableDragColSize( bool enable = true ); void DisableDragColSize(); bool CanDragColSize(); + void EnableDragColMove( bool enable = true ); + void DisableDragColMove() { EnableDragColMove( false ); } + bool CanDragColMove() { return m_canDragColMove; } void EnableDragGridSize(bool enable = true); void DisableDragGridSize(); bool CanDragGridSize(); @@ -1848,6 +1897,10 @@ public: void SetColSize( int col, int width ); + int GetColAt( int colPos ) const; + void SetColPos( int colID, int newPos ); + int GetColPos( int colID ) const; + // 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 // for this column @@ -2021,7 +2074,7 @@ public: bool MetaDown(); bool ShiftDown(); bool AltDown(); - + bool CmdDown(); }; @@ -2038,7 +2091,7 @@ public: bool MetaDown(); bool ShiftDown(); bool AltDown(); - + bool CmdDown(); }; @@ -2063,6 +2116,7 @@ public: bool MetaDown(); bool ShiftDown(); bool AltDown(); + bool CmdDown(); };