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

Allow minimal acceptable row height/column width to be set to 0 for

Browse Source 
hiding rows/columns.
Only return true from CanEnableCellControl if a valid cell is selected
        (fixing Bug #837656).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2003-11-08 18:58:04 +00:00
parent 737928c244
commit 20c8441047
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/grid.cpp
View File

@@ -7478,7 +7478,9 @@ bool wxGrid::IsCurrentCellReadOnly() const
bool wxGrid::CanEnableCellControl() const bool wxGrid::CanEnableCellControl() const
{ {
return m_editable && !IsCurrentCellReadOnly(); return m_editable && (m_currentCellCoords != wxGridNoCellCoords) &&
!IsCurrentCellReadOnly();
} }
bool wxGrid::IsCellEditControlEnabled() const bool wxGrid::IsCellEditControlEnabled() const
@@ -7741,7 +7743,10 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist,
if ( coord >= BorderArray[i_max]) if ( coord >= BorderArray[i_max])
{ {
i_min = i_max; i_min = i_max;
if (minDist)
i_max = coord / minDist; i_max = coord / minDist;
else
i_max = BorderArray.GetCount() - 1;
} }
if ( i_max >= BorderArray.GetCount()) if ( i_max >= BorderArray.GetCount())
i_max = BorderArray.GetCount() - 1; i_max = BorderArray.GetCount() - 1;
@@ -9486,14 +9491,18 @@ int wxGrid::GetRowMinimalHeight(int row) const
void wxGrid::SetColMinimalAcceptableWidth( int width ) void wxGrid::SetColMinimalAcceptableWidth( int width )
{ {
if ( width<1 ) // We do allow a width of 0 since this gives us
// an easy way to temporarily hidding columns.
if ( width<0 )
return; return;
m_minAcceptableColWidth = width; m_minAcceptableColWidth = width;
} }
void wxGrid::SetRowMinimalAcceptableHeight( int height ) void wxGrid::SetRowMinimalAcceptableHeight( int height )
{ {
if ( height<1 ) // We do allow a height of 0 since this gives us
// an easy way to temporarily hidding rows.
if ( height<0 )
return; return;
m_minAcceptableRowHeight = height; m_minAcceptableRowHeight = height;
}; };