X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e2129f90f06ac57918023898392a8f3020b2a22..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/src/grid.i diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 09db772abf..06bb151211 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 // @@ -45,6 +45,50 @@ %} //--------------------------------------------------------------------------- +// 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); } + + +%{ + +#define wxPyMake_TEMPLATE(TYPE) \ +PyObject* wxPyMake_##TYPE(TYPE* source) { \ + PyObject* target = NULL; \ + if (source) { \ + /* Check if there is already a pointer to a Python object in the \ + OOR data that we can use. */ \ + wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ + if (data) { \ + target = data->m_obj; \ + 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); \ + if (target) \ + source->SetClientObject(new wxPyOORClientData(target)); \ + } \ + } else { /* source was NULL so return None. */ \ + Py_INCREF(Py_None); target = Py_None; \ + } \ + return target; \ +} \ + + +wxPyMake_TEMPLATE(wxGridCellRenderer) +wxPyMake_TEMPLATE(wxGridCellEditor) +wxPyMake_TEMPLATE(wxGridCellAttr) +wxPyMake_TEMPLATE(wxGridCellAttrProvider) +wxPyMake_TEMPLATE(wxGridTableBase) + +%} + //--------------------------------------------------------------------------- // Macros, similar to what's in helpers.h, to aid in the creation of // virtual methods that are able to make callbacks to Python. Many of these @@ -81,14 +125,14 @@ #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \ void CBNAME(wxGridCellAttr *attr, int a, int b) { \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ + PyObject* obj = wxPyMake_wxGridCellAttr(attr); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ PCLASS::CBNAME(attr, a, b); \ } \ @@ -100,10 +144,10 @@ #define PYCALLBACK__GCAINT(PCLASS, CBNAME) \ void CBNAME(wxGridCellAttr *attr, int val) { \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ bool found; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\ + PyObject* obj = wxPyMake_wxGridCellAttr(attr); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \ Py_DECREF(obj); \ } \ @@ -160,8 +204,11 @@ #define PYCALLBACK__INTINTSTRING_pure(CBNAME) \ void CBNAME(int a, int b, const wxString& c) { \ wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,wx2PyString(c)));\ + 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(); \ } @@ -194,8 +241,11 @@ bool rval = 0; \ bool found; \ wxPyBeginBlockThreads(); \ - if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", a,b,wx2PyString(c)));\ + 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(); \ if (! found) \ rval = PCLASS::CBNAME(a,b,c); \ @@ -258,7 +308,7 @@ Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -272,10 +322,10 @@ #define PYCALLBACK__(PCLASS, CBNAME) \ void CBNAME() { \ bool found; \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -290,10 +340,10 @@ bool CBNAME(size_t a, size_t b) { \ bool rval = 0; \ bool found; \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -308,10 +358,10 @@ bool CBNAME(size_t a) { \ bool rval = 0; \ bool found; \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -348,8 +398,11 @@ void CBNAME(int a, const wxString& c) { \ bool found; \ wxPyBeginBlockThreads(); \ - if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", a, wx2PyString(c))); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* s = wx2PyString(c); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \ + Py_DECREF(s); \ + } \ wxPyEndBlockThreads(); \ if (! found) \ PCLASS::CBNAME(a,c); \ @@ -446,50 +499,6 @@ -%} - -//--------------------------------------------------------------------------- -// 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); } - -%{ - - -#define wxPyMake_TEMPLATE(TYPE) \ -PyObject* wxPyMake_##TYPE(TYPE* source) { \ - PyObject* target = NULL; \ - if (source) { \ - /* Check if there is already a pointer to a Python object in the \ - OOR data that we can use. */ \ - wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ - if (data) { \ - target = data->m_obj; \ - 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, #TYPE, FALSE); \ - if (target) \ - source->SetClientObject(new wxPyOORClientData(target)); \ - } \ - } else { /* source was NULL so return None. */ \ - Py_INCREF(Py_None); target = Py_None; \ - } \ - return target; \ -} \ - -wxPyMake_TEMPLATE(wxGridCellRenderer) -wxPyMake_TEMPLATE(wxGridCellEditor) -wxPyMake_TEMPLATE(wxGridCellAttr) -wxPyMake_TEMPLATE(wxGridCellAttrProvider) -wxPyMake_TEMPLATE(wxGridTableBase) - %} //--------------------------------------------------------------------------- @@ -559,13 +568,17 @@ public: int row, int col, bool isSelected) { wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Draw")) { - wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(OOOOiii)", - wxPyConstructObject((void*)&grid, "wxGrid", 0), - wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0), - wxPyConstructObject((void*)&dc, "wxDC", 0), - wxPyConstructObject((void*)&rect, "wxRect", 0), - row, col, isSelected)); + PyObject* go = wxPyMake_wxObject(&grid); + PyObject* dco = wxPyMake_wxObject(&dc); + PyObject* ao = wxPyMake_wxGridCellAttr(&attr); + PyObject* ro = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); + + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro, + row, col, isSelected)); + Py_DECREF(go); + Py_DECREF(ao); + Py_DECREF(dco); + Py_DECREF(ro); } wxPyEndBlockThreads(); } @@ -577,12 +590,17 @@ public: if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) { PyObject* ro; wxSize* ptr; - ro = wxPyCBH_callCallbackObj(m_myInst, - Py_BuildValue("(OOOii)", - wxPyConstructObject((void*)&grid, "wxGrid", 0), - wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0), - wxPyConstructObject((void*)&dc, "wxDC", 0), - row, col)); + PyObject* go = wxPyMake_wxObject(&grid); + PyObject* dco = wxPyMake_wxObject(&dc); + PyObject* ao = wxPyMake_wxGridCellAttr(&attr); + + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)", + go, ao, dco, + row, col)); + Py_DECREF(go); + Py_DECREF(ao); + Py_DECREF(dco); + 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")) { @@ -729,6 +747,9 @@ public: wxControl* GetControl(); void SetControl(wxControl* control); + wxGridCellAttr* GetCellAttr(); + void SetCellAttr(wxGridCellAttr* attr); + void SetParameters(const wxString& params); void IncRef(); void DecRef(); @@ -763,11 +784,12 @@ public: void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Create")) { - wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(OiO)", - wxPyConstructObject((void*)parent, "wxWindow", 0), - id, - wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0))); + PyObject* po = wxPyMake_wxObject(parent); + PyObject* eo = wxPyMake_wxObject(evtHandler); + + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo)); + Py_DECREF(po); + Py_DECREF(eo); } wxPyEndBlockThreads(); } @@ -776,9 +798,9 @@ public: void BeginEdit(int row, int col, wxGrid* grid) { wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) { - wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(iiO)", row, col, - wxPyConstructObject((void*)grid, "wxGrid", 0))); + PyObject* go = wxPyMake_wxObject(grid); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); + Py_DECREF(go); } wxPyEndBlockThreads(); } @@ -788,16 +810,16 @@ public: bool rv = FALSE; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "EndEdit")) { - rv = wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(iiO)", row, col, - wxPyConstructObject((void*)grid, "wxGrid", 0))); + PyObject* go = wxPyMake_wxObject(grid); + rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); + Py_DECREF(go); } wxPyEndBlockThreads(); return rv; } - wxGridCellEditor*Clone() const { + wxGridCellEditor* Clone() const { wxGridCellEditor* rval = NULL; wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "Clone")) { @@ -818,10 +840,11 @@ public: void Show(bool show, wxGridCellAttr *attr) { bool found; wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) - wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(iO)", show, - wxPyConstructObject((void*)attr, "wxGridCellAttr", 0))); + if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) { + PyObject* ao = wxPyMake_wxGridCellAttr(attr); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao)); + Py_DECREF(ao); + } wxPyEndBlockThreads(); if (! found) wxGridCellEditor::Show(show, attr); @@ -832,13 +855,17 @@ public: void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { - bool found; \ + bool found; wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) - wxPyCBH_callCallback(m_myInst, - Py_BuildValue("(OO)", - wxPyConstructObject((void*)&rectCell, "wxRect", 0), - wxPyConstructObject((void*)attr, "wxGridCellAttr", 0))); + if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { + PyObject* ao = wxPyMake_wxGridCellAttr(attr); + PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); + + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao)); + + Py_DECREF(ro); + Py_DECREF(ao); + } wxPyEndBlockThreads(); if (! found) wxGridCellEditor::PaintBackground(rectCell, attr); @@ -856,6 +883,7 @@ public: DEC_PYCALLBACK__(StartingClick); DEC_PYCALLBACK__(Destroy); DEC_PYCALLBACK__STRING(SetParameters); + DEC_PYCALLBACK_STRING__constpure(GetValue); PYPRIVATE; }; @@ -869,6 +897,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); %} @@ -884,7 +913,7 @@ public: 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); @@ -900,6 +929,7 @@ class wxGridCellTextEditor : public wxGridCellEditor public: wxGridCellTextEditor(); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -908,6 +938,7 @@ class wxGridCellNumberEditor : public wxGridCellTextEditor public: wxGridCellNumberEditor(int min = -1, int max = -1); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -916,6 +947,7 @@ class wxGridCellFloatEditor : public wxGridCellTextEditor public: wxGridCellFloatEditor(); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -924,6 +956,7 @@ class wxGridCellBoolEditor : public wxGridCellEditor public: wxGridCellBoolEditor(); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; class wxGridCellChoiceEditor : public wxGridCellEditor @@ -933,6 +966,7 @@ public: const wxString* choices = NULL, bool allowOthers = FALSE); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -941,6 +975,7 @@ class wxGridCellEnumEditor : public wxGridCellChoiceEditor public: wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString ); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -949,6 +984,7 @@ class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor public: wxGridCellAutoWrapStringEditor(); %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + virtual wxString GetValue(); }; @@ -986,6 +1022,8 @@ public: void SetBackgroundColour(const wxColour& colBack); void SetFont(const wxFont& font); void SetAlignment(int hAlign, int vAlign); + void SetSize(int num_rows, int num_cols); + void SetOverflow( bool allow = TRUE ); void SetReadOnly(bool isReadOnly = TRUE); void SetRenderer(wxGridCellRenderer *renderer); @@ -999,11 +1037,14 @@ 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; + void GetSize(int *OUTPUT, int *OUTPUT) const; + bool GetOverflow() const; wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const; wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const; @@ -1189,7 +1230,9 @@ public: void SetValue(int row, int col, const wxString& val) { wxPyBeginBlockThreads(); if (wxPyCBH_findCallback(m_myInst, "SetValue")) { - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,wx2PyString(val))); + PyObject* s = wx2PyString(val); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s)); + Py_DECREF(s); } wxPyEndBlockThreads(); } @@ -1373,8 +1416,17 @@ public: return *self != other; } } - %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())" - %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())" + %pragma(python) addtoclass = " + 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... @@ -1410,6 +1462,36 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) { } %} + + +// Typemap to convert an array of cells coords to a list of tuples... +%typemap(python, out) wxGridCellCoordsArray { + $target = wxGridCellCoordsArray_helper($source); +} + +%typemap(python, ret) wxGridCellCoordsArray { + delete $source; +} + + +// ...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; +} +%} + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- // The grid itself @@ -1444,6 +1526,7 @@ public: bool CreateGrid( int numRows, int numCols, WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells ); void SetSelectionMode(WXGRIDSELECTIONMODES selmode); + WXGRIDSELECTIONMODES GetSelectionMode(); // ------ grid dimensions @@ -1478,7 +1561,8 @@ 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 @@ -1499,11 +1583,12 @@ 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 ); @@ -1582,6 +1667,7 @@ public: wxFont GetLabelFont(); void GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ); void GetColLabelAlignment( int *OUTPUT, int *OUTPUT ); + int GetColLabelTextOrientation(); wxString GetRowLabelValue( int row ); wxString GetColLabelValue( int col ); wxColour GetGridLineColour(); @@ -1596,6 +1682,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& ); @@ -1614,6 +1701,7 @@ public: 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); @@ -1640,8 +1728,11 @@ 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 GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ); + void GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ); + bool GetDefaultCellOverflow(); + bool GetCellOverflow( int row, int col ); + void GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ); void SetDefaultRowSize( int height, bool resizeExistingRows = FALSE ); void SetRowSize( int row, int height ); @@ -1664,12 +1755,24 @@ public: // 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& ); @@ -1679,6 +1782,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); @@ -1724,6 +1830,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 @@ -1922,8 +2038,6 @@ def EVT_GRID_EDITOR_CREATED(win, fn): //--------------------------------------------------------------------------- %init %{ - wxClassInfo::CleanUpClasses(); - wxClassInfo::InitializeClasses(); %} //---------------------------------------------------------------------------