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

Fixed SetCurrentCell for Motif, removed SelectionToDEviceRect.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-05-28 14:16:10 +00:00
parent e54334e7f1
commit d270402a9f
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/generic/grid.h
View File

@@ -1311,15 +1311,6 @@ public:
wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft, wxRect BlockToDeviceRect( const wxGridCellCoords & topLeft,
const wxGridCellCoords & bottomRight ); const wxGridCellCoords & bottomRight );
// This function returns the rectangle that encloses the selected cells
// in device coords and clipped to the client size of the grid window.
//
wxRect SelectionToDeviceRect()
{
return BlockToDeviceRect( m_selectingTopLeft,
m_selectingBottomRight );
}
// Access or update the selection fore/back colours // Access or update the selection fore/back colours
wxColour GetSelectionBackground() const wxColour GetSelectionBackground() const
{ return m_selectionBackground; } { return m_selectionBackground; }

21
src/generic/grid.cpp
View File

@@ -5358,6 +5358,9 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
return; return;
} }
wxClientDC dc(m_gridWin);
PrepareDC(dc);
if ( m_currentCellCoords != wxGridNoCellCoords ) if ( m_currentCellCoords != wxGridNoCellCoords )
{ {
HideCellEditControl(); HideCellEditControl();
@@ -5377,28 +5380,16 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
// Otherwise refresh redraws the highlight! // Otherwise refresh redraws the highlight!
m_currentCellCoords = coords; m_currentCellCoords = coords;
m_gridWin->Refresh( FALSE, &r ); CalcCellsExposed( r );
DrawGridCellArea(dc);
DrawAllGridLines( dc, r );
} }
m_currentCellCoords = coords; m_currentCellCoords = coords;
wxClientDC dc(m_gridWin);
PrepareDC(dc);
wxGridCellAttr* attr = GetCellAttr(coords); wxGridCellAttr* attr = GetCellAttr(coords);
DrawCellHighlight(dc, attr); DrawCellHighlight(dc, attr);
attr->DecRef(); attr->DecRef();
#if 0
// SN: For my extended selection code, automatic
// deselection is definitely not a good idea.
if ( IsSelection() )
{
wxRect r( SelectionToDeviceRect() );
ClearSelection();
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
}
#endif
} }