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

fix for d_mars 8.35

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-08-26 19:32:45 +00:00
parent 5aa417d57c
commit f1e269209a
1 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/generic/gridsel.cpp
View File

@@ -931,33 +931,35 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
count = m_rowSelection.GetCount(); count = m_rowSelection.GetCount();
for ( n = 0; n < count; n++ ) for ( n = 0; n < count; n++ )
{ {
int & rowOrCol = m_rowSelection[n]; int rowOrCol_ = m_rowSelection [ n ];
if ( (size_t)rowOrCol >= pos )
if ( ( size_t ) rowOrCol_ >= pos )
{ {
if ( numRows > 0 ) if ( numRows > 0 )
{ {
// If rows inserted, include row counter where necessary m_rowSelection [ n ] += numRows;
rowOrCol += numRows;
} }
else if ( numRows < 0 ) else if ( numRows < 0 )
{ {
// If rows deleted, either decrement row counter (if row still exists) if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) )
if ((size_t)rowOrCol >= pos - numRows) m_rowSelection [ n ] += numRows;
rowOrCol += numRows;
else else
{ {
m_rowSelection.RemoveAt ( n ); m_rowSelection.RemoveAt ( n );
n--; count--; n--;
count--;
} }
} }
} }
} }
// No need to touch selected columns, unless we removed _all_ // No need to touch selected columns, unless we removed _all_
// rows, in this case, we remove all columns from the selection. // rows, in this case, we remove all columns from the selection.
if ( !m_grid->GetNumberRows() ) if ( !m_grid->GetNumberRows() )
m_colSelection.Clear(); m_colSelection.Clear();
} }
void wxGridSelection::UpdateCols( size_t pos, int numCols ) void wxGridSelection::UpdateCols( size_t pos, int numCols )
{ {
size_t count = m_cellSelection.GetCount(); size_t count = m_cellSelection.GetCount();
@@ -1037,26 +1039,25 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
count = m_colSelection.GetCount(); count = m_colSelection.GetCount();
for ( n = 0; n < count; n++ ) for ( n = 0; n < count; n++ )
{ {
int & rowOrCol = m_colSelection[n];
int rowOrCol = m_colSelection [ n ];
if ( ( size_t ) rowOrCol >= pos ) if ( ( size_t ) rowOrCol >= pos )
{ {
if ( numCols > 0 ) if ( numCols > 0 )
{ m_colSelection [ n ] += numCols;
// If cols inserted, include col counter where necessary
rowOrCol += numCols;
}
else if ( numCols < 0 ) else if ( numCols < 0 )
{ {
// If cols deleted, either decrement col counter (if col still exists) if ( ( size_t ) rowOrCol >= ( pos -numCols ) )
if ((size_t)rowOrCol >= pos - numCols) m_colSelection [ n ] += numCols;
rowOrCol += numCols;
else else
{ {
m_colSelection.RemoveAt ( n ); m_colSelection.RemoveAt ( n );
n--; count--; n--;
count--;
} }
} }
} }
} }
// No need to touch selected rows, unless we removed _all_ // No need to touch selected rows, unless we removed _all_
@@ -1065,6 +1066,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
m_rowSelection.Clear(); m_rowSelection.Clear();
} }
int wxGridSelection::BlockContain( int topRow1, int leftCol1, int wxGridSelection::BlockContain( int topRow1, int leftCol1,
int bottomRow1, int rightCol1, int bottomRow1, int rightCol1,
int topRow2, int leftCol2, int topRow2, int leftCol2,
@@ -1083,4 +1085,3 @@ int wxGridSelection::BlockContain( int topRow1, int leftCol1,
} }
#endif #endif