AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fix in screen update code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2000-02-06 19:51:59 +00:00
parent 457e6c54a2
commit cb309039b6
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/generic/grid.cpp
View File

@ -1133,7 +1133,7 @@ void wxGrid::CalcDimensions()
GetViewStart( &x, &y ); GetViewStart( &x, &y );
SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE, right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
x, y ); x, y, TRUE );
} }
} }
@ -1595,6 +1595,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
// Only needed to get the correct rect.y: // Only needed to get the correct rect.y:
wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) ); wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
rect.x = 0; rect.x = 0;
CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
rect.width = m_rowLabelWidth; rect.width = m_rowLabelWidth;
rect.height = ch - rect.y; rect.height = ch - rect.y;
m_rowLabelWin->Refresh( TRUE, &rect ); m_rowLabelWin->Refresh( TRUE, &rect );
@ -1782,6 +1783,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
// Only needed to get the correct rect.x: // Only needed to get the correct rect.x:
wxRect rect ( CellToRect( 0, m_dragRowOrCol ) ); wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
rect.y = 0; rect.y = 0;
CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
rect.width = cw - rect.x; rect.width = cw - rect.x;
rect.height = m_colLabelHeight; rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect ); m_colLabelWin->Refresh( TRUE, &rect );
@ -3963,6 +3965,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s )
wxRect rect = CellToRect( row, 0); wxRect rect = CellToRect( row, 0);
if ( rect.height > 0 ) if ( rect.height > 0 )
{ {
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
rect.x = m_left; rect.x = m_left;
rect.width = m_rowLabelWidth; rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( TRUE, &rect ); m_rowLabelWin->Refresh( TRUE, &rect );
@ -3981,6 +3984,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s )
wxRect rect = CellToRect( 0, col ); wxRect rect = CellToRect( 0, col );
if ( rect.width > 0 ) if ( rect.width > 0 )
{ {
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
rect.y = m_top; rect.y = m_top;
rect.height = m_colLabelHeight; rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect ); m_colLabelWin->Refresh( TRUE, &rect );
@ -4483,65 +4487,65 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
temp = oldLeft; temp = oldLeft;
oldLeft = leftCol; oldLeft = leftCol;
leftCol = temp; leftCol = temp;
} }
if (oldTop > topRow ) if (oldTop > topRow )
{ {
temp = oldTop; temp = oldTop;
oldTop = topRow; oldTop = topRow;
topRow = temp; topRow = temp;
} }
if (oldRight < rightCol ) if (oldRight < rightCol )
{ {
temp = oldRight; temp = oldRight;
oldRight = rightCol; oldRight = rightCol;
rightCol = temp; rightCol = temp;
} }
if (oldBottom < bottomRow) if (oldBottom < bottomRow)
{ {
temp = oldBottom; temp = oldBottom;
oldBottom = bottomRow; oldBottom = bottomRow;
bottomRow = temp; bottomRow = temp;
} }
// Now, either the stuff marked old is the outer // Now, either the stuff marked old is the outer
// rectangle or we don't have a situation where one // rectangle or we don't have a situation where one
// is contained in the other. // is contained in the other.
if ( oldLeft < leftCol ) if ( oldLeft < leftCol )
{ {
need_refresh[0] = TRUE; need_refresh[0] = TRUE;
rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
oldLeft ), oldLeft ),
wxGridCellCoords ( oldBottom, wxGridCellCoords ( oldBottom,
leftCol - 1 ) ); leftCol - 1 ) );
} }
if ( oldTop < topRow ) if ( oldTop < topRow )
{ {
need_refresh[1] = TRUE; need_refresh[1] = TRUE;
rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
leftCol ), leftCol ),
wxGridCellCoords ( topRow - 1, wxGridCellCoords ( topRow - 1,
rightCol ) ); rightCol ) );
} }
if ( oldRight > rightCol ) if ( oldRight > rightCol )
{ {
need_refresh[2] = TRUE; need_refresh[2] = TRUE;
rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
rightCol + 1 ), rightCol + 1 ),
wxGridCellCoords ( oldBottom, wxGridCellCoords ( oldBottom,
oldRight ) ); oldRight ) );
} }
if ( oldBottom > bottomRow ) if ( oldBottom > bottomRow )
{ {
need_refresh[3] = TRUE; need_refresh[3] = TRUE;
rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
leftCol ), leftCol ),
wxGridCellCoords ( oldBottom, wxGridCellCoords ( oldBottom,
rightCol ) ); rightCol ) );
} }
// Change Selection // Change Selection