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

Added Paul Gamman's patch for 0 as FALSE in bool editor and renderer.

Browse Source 
Fixed bug in grid selection code that caused crashes (e.g. when grid
had just 1 col and mode was row selection).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-08-08 10:43:16 +00:00
parent a98c006d8d
commit 695a326318
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/grid.cpp
View File

@@ -1189,7 +1189,10 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
m_startValue = grid->GetTable()->GetValueAsBool(row, col); m_startValue = grid->GetTable()->GetValueAsBool(row, col);
else else
m_startValue = !!grid->GetTable()->GetValue(row, col); {
wxString cellval( grid->GetTable()->GetValue(row, col) );
m_startValue = !( !cellval || (cellval == "0") );
}
CBox()->SetValue(m_startValue); CBox()->SetValue(m_startValue);
CBox()->SetFocus(); CBox()->SetFocus();
} }
@@ -1795,7 +1798,10 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
value = grid.GetTable()->GetValueAsBool(row, col); value = grid.GetTable()->GetValueAsBool(row, col);
else else
value = !!grid.GetTable()->GetValue(row, col); {
wxString cellval( grid.GetTable()->GetValue(row, col) );
value = !( !cellval || (cellval == "0") );
}
if ( value ) if ( value )
{ {

6
src/generic/gridsel.cpp
View File

@@ -402,7 +402,11 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
} }
// Handle single cell selection in SelectCell. // Handle single cell selection in SelectCell.
if ( topRow == bottomRow && leftCol == rightCol ) // (MB: added check for selection mode here to prevent
// crashes if, for example, we are select rows and the
// grid only has 1 col)
if ( m_selectionMode == wxGrid::wxGridSelectCells &&
topRow == bottomRow && leftCol == rightCol )
SelectCell( topRow, leftCol, ControlDown, ShiftDown, SelectCell( topRow, leftCol, ControlDown, ShiftDown,
AltDown, MetaDown, sendEvent ); AltDown, MetaDown, sendEvent );