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

Fixed apparent typo in wxGridCellAttr::MergeWith, hopefully fixing

Browse Source 
bug 581558 (wxGrid.SetColAttr vs. SetCellAlignment)
Remove editor in Redimension. This should fix
        bug 593189 (wxGrid:delting rows doesn't hide editor)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2002-09-01 18:14:31 +00:00
parent cd3c2375e6
commit 7e48d7d9fb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/grid.cpp
View File

@@ -1953,7 +1953,7 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom)
SetBackgroundColour(mergefrom->GetBackgroundColour()); SetBackgroundColour(mergefrom->GetBackgroundColour());
if ( !HasFont() && mergefrom->HasFont() ) if ( !HasFont() && mergefrom->HasFont() )
SetFont(mergefrom->GetFont()); SetFont(mergefrom->GetFont());
if ( !!HasAlignment() && mergefrom->HasAlignment() ){ if ( !HasAlignment() && mergefrom->HasAlignment() ){
int hAlign, vAlign; int hAlign, vAlign;
mergefrom->GetAlignment( &hAlign, &vAlign); mergefrom->GetAlignment( &hAlign, &vAlign);
SetAlignment(hAlign, vAlign); SetAlignment(hAlign, vAlign);
@@ -3997,6 +3997,12 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
// Clear the attribute cache as the attribute might refer to a different // Clear the attribute cache as the attribute might refer to a different
// cell than stored in the cache after adding/removing rows/columns. // cell than stored in the cache after adding/removing rows/columns.
ClearAttrCache(); ClearAttrCache();
// By the same reasoning, the editor should be dismissed if columns are
// added or removed. And for consistency, it should IMHO always be
// removed, not only if the cell "underneath" it actually changes.
// For now, I intentionally do not save the editor's content as the
// cell it might want to save that stuff to might no longer exist.
DisableCellEditControl();
#if 0 #if 0
// if we were using the default widths/heights so far, we must change them // if we were using the default widths/heights so far, we must change them
// now // now