Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix changing size of merged cells (#9736)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-15 14:36:28 +00:00
parent c7739476c7
commit f89a4c2df5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -103,6 +103,7 @@ All (GUI):
- Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version. - Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
- Set wxKeyEvent::m_uniChar correctly in the events generated by generic - Set wxKeyEvent::m_uniChar correctly in the events generated by generic
wxListCtrl (Mikkel S). wxListCtrl (Mikkel S).
- Fix changing size of merged cells in wxGrid (Laurent Humbertclaude).
- Fixed wrapping bug in wxRichTextCtrl when there were images present; - Fixed wrapping bug in wxRichTextCtrl when there were images present;
now sets the cursor to the next line after pressing Shift+Enter. now sets the cursor to the next line after pressing Shift+Enter.

2
src/generic/grid.cpp
View File

@@ -10277,7 +10277,7 @@ void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols )
wxT("wxGrid::SetCellSize setting cell size to < 1")); wxT("wxGrid::SetCellSize setting cell size to < 1"));
// if this was already a multicell then "turn off" the other cells first // if this was already a multicell then "turn off" the other cells first
if ((cell_rows > 1) || (cell_rows > 1)) if ((cell_rows > 1) || (cell_cols > 1))
{ {
int i, j; int i, j;
for (j=row; j < row + cell_rows; j++) for (j=row; j < row + cell_rows; j++)