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

second merge of the 2.2 branch (RL)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/grid.cpp
View File

@@ -3825,8 +3825,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
if (attrProvider) {
attrProvider->UpdateAttrRows( pos, -((int)numRows) );
// ifdef'd out following patch from Paul Gammans
#if 0
// ifdef'd out following patch from Paul Gammans
#if 0
// No need to touch column attributes, unless we
// removed _all_ rows, in this case, we remove
// all column attributes.
// I hate to do this here, but the
@@ -3961,7 +3962,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
if (attrProvider) {
attrProvider->UpdateAttrCols( pos, -((int)numCols) );
// ifdef'd out following patch from Paul Gammans
#if 0
#if 0
// No need to touch row attributes, unless we
// removed _all_ columns, in this case, we remove
// all row attributes.
@@ -5595,7 +5596,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
HideCellEditControl();
DisableCellEditControl();
if ( IsVisible( m_currentCellCoords, FALSE ) ) // zzz
if ( IsVisible( m_currentCellCoords, FALSE ) )
{
wxRect r;
r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
@@ -6417,7 +6418,7 @@ void wxGrid::ShowCellEditControl()
{
if ( !IsVisible( m_currentCellCoords ) )
{
m_cellEditCtrlEnabled = false;
m_cellEditCtrlEnabled = FALSE;
return;
}
else