diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt index 2b2c3e4d51..0e4fe48be5 100644 --- a/wxPython/CHANGES.txt +++ b/wxPython/CHANGES.txt @@ -36,6 +36,12 @@ and _DIALOG if you wish, although I don't know why you would. You can now overload OnInitGui, OnExit and OnAssert in your classes derived from wxApp. +Added GetSelectedCells, GetSelectionBlockTopLeft, +GetSelectionBlockBottomRight, GetSelectedRows, GetSelectedCols nethods +to wxGrid. + +Added Python == and != operators for some basic classes + diff --git a/wxPython/setup.py b/wxPython/setup.py index 4524c51d00..e4f490b00d 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -788,6 +788,7 @@ if not GL_ONLY and BUILD_XRC: '%s/xh_radbt.cpp' % XMLLOC, '%s/xh_radbx.cpp' % XMLLOC, '%s/xh_scrol.cpp' % XMLLOC, + '%s/xh_scwin.cpp' % XMLLOC, '%s/xh_sizer.cpp' % XMLLOC, '%s/xh_slidr.cpp' % XMLLOC, diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 47064173eb..0683a479ff 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -2121,6 +2121,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxRA_SPECIFY_ROWS", PyInt_FromLong((long) wxRA_SPECIFY_ROWS)); PyDict_SetItemString(d,"wxRA_SPECIFY_COLS", PyInt_FromLong((long) wxRA_SPECIFY_COLS)); PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP)); + PyDict_SetItemString(d,"wxRB_SINGLE", PyInt_FromLong((long) wxRB_SINGLE)); PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR)); PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL)); PyDict_SetItemString(d,"wxGA_VERTICAL", PyInt_FromLong((long) wxGA_VERTICAL)); diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index a9ff66c4d9..83bd3a789c 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -288,6 +288,7 @@ wxRA_VERTICAL = wxc.wxRA_VERTICAL wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS wxRB_GROUP = wxc.wxRB_GROUP +wxRB_SINGLE = wxc.wxRB_SINGLE wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL wxGA_VERTICAL = wxc.wxGA_VERTICAL