|
From: John L. <jr...@us...> - 2008-12-13 22:35:57
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25876/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxadv_grid.i Log Message: Fix genwxbind.bat to do wxluacan bindings correctly. Add wxGridCellCoordsArray to bindings and functions for wxGrid to get selected cells. Cleanup bindings.wx.lua to not make you have to click to show overloaded functions, just show them inline. Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** wx_datatypes.lua 5 Dec 2008 04:31:30 -0000 1.98 --- wx_datatypes.lua 13 Dec 2008 22:35:52 -0000 1.99 *************** *** 1800,1803 **** --- 1800,1810 ---- ValueType = "class", }, + wxGridCellCoordsArray = { + ["%encapsulate"] = true, + Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", + IsNumber = false, + Name = "wxGridCellCoordsArray", + ValueType = "class", + }, wxGridCellDateTimeRenderer = { ["%encapsulate"] = true, Index: wxadv_grid.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_grid.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_grid.i 17 Mar 2008 03:05:01 -0000 1.3 --- wxadv_grid.i 13 Dec 2008 22:35:52 -0000 1.4 *************** *** 35,38 **** --- 35,40 ---- %define_string wxGRID_VALUE_DATETIME + %wxchkver_2_8_8 %define wxGRID_AUTOSIZE + // --------------------------------------------------------------------------- // wxGridCellWorker *************** *** 430,434 **** %class %delete %noclassinfo %encapsulate wxGridCellCoords ! %define_object wxGridNoCellRect wxGridCellCoords( int r = -1, int c = -1 ) --- 432,436 ---- %class %delete %noclassinfo %encapsulate wxGridCellCoords ! %define_object wxGridNoCellCoords wxGridCellCoords( int r = -1, int c = -1 ) *************** *** 442,445 **** --- 444,471 ---- %operator wxGridCellCoords& operator=( const wxGridCellCoords& other ) %operator bool operator==( const wxGridCellCoords& other ) const + %operator bool operator!() const + %endclass + + // --------------------------------------------------------------------------- + // wxGridCellCoordsArray + + %include "wx/dynarray.h" + + %class %delete %noclassinfo %encapsulate wxGridCellCoordsArray + wxGridCellCoordsArray() + wxGridCellCoordsArray(const wxGridCellCoordsArray& array) + + void Add( const wxGridCellCoords& c ) + void Alloc(size_t count) + void Clear() + int GetCount() const + bool IsEmpty() const + void Insert( const wxGridCellCoords& c, int n, int copies = 1 ) + wxGridCellCoords Item( int n ) + void RemoveAt(size_t index) + void Shrink() + + %operator wxGridCellCoords operator[](size_t nIndex) + %endclass *************** *** 696,704 **** // bool IsInSelection( const wxGridCellCoords& coords ) ! //wxGridCellCoordsArray GetSelectedCells() const ! //wxGridCellCoordsArray GetSelectionBlockTopLeft() const ! //wxGridCellCoordsArray GetSelectionBlockBottomRight() const ! //wxArrayInt GetSelectedRows() const ! //wxArrayInt GetSelectedCols() const wxRect BlockToDeviceRect( const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight ) --- 722,730 ---- // bool IsInSelection( const wxGridCellCoords& coords ) ! wxGridCellCoordsArray GetSelectedCells() const ! wxGridCellCoordsArray GetSelectionBlockTopLeft() const ! wxGridCellCoordsArray GetSelectionBlockBottomRight() const ! wxArrayInt GetSelectedRows() const ! wxArrayInt GetSelectedCols() const wxRect BlockToDeviceRect( const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight ) |