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

Improved cell highlighting when in-place editing is disabled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
1999-10-18 03:13:45 +00:00
parent 98397babd3
commit edc2c29006
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/grid.cpp
View File

@@ -602,6 +602,8 @@ void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev )
case WXK_DOWN: case WXK_DOWN:
case WXK_LEFT: case WXK_LEFT:
case WXK_RIGHT: case WXK_RIGHT:
case WXK_PRIOR:
case WXK_NEXT:
case WXK_RETURN: case WXK_RETURN:
if ( m_isCellControl ) if ( m_isCellControl )
{ {
@@ -805,10 +807,9 @@ void wxGrid::Init()
wxGRID_CELLCTRL, wxGRID_CELLCTRL,
"", "",
wxPoint(1,1), wxPoint(1,1),
wxSize(1,1), wxSize(1,1)
wxNO_BORDER
#ifdef __WXMSW__ #ifdef __WXMSW__
| wxTE_MULTILINE | wxTE_NO_VSCROLL , wxTE_MULTILINE | wxTE_NO_VSCROLL
#endif #endif
); );
@@ -3035,13 +3036,13 @@ void wxGrid::DrawCellHighlight( wxDC& dc, int row, int col )
y = m_rowBottoms[row] - m_rowHeights[row]; y = m_rowBottoms[row] - m_rowHeights[row];
if ( y >= ch ) return; if ( y >= ch ) return;
dc.SetLogicalFunction( wxXOR ); dc.SetLogicalFunction( wxINVERT );
dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) ); dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) );
dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( x, y, dc.DrawRectangle( x-2, y-2,
m_colWidths[col] + 2, m_colWidths[col] + 6,
m_rowHeights[row] + 2 ); m_rowHeights[row] + 6 );
dc.SetLogicalFunction( wxCOPY ); dc.SetLogicalFunction( wxCOPY );
} }
@@ -3076,7 +3077,8 @@ void wxGrid::DrawCell( int row, int col )
// //
void wxGrid::HideCurrentCellHighlight( wxDC& dc ) void wxGrid::HideCurrentCellHighlight( wxDC& dc )
{ {
if ( m_currentCellHighlighted && if ( !m_cellEditCtrlEnabled &&
m_currentCellHighlighted &&
m_currentCellCoords != wxGridNoCellCoords ) m_currentCellCoords != wxGridNoCellCoords )
{ {
DrawCellHighlight( dc, m_currentCellCoords ); DrawCellHighlight( dc, m_currentCellCoords );
@@ -3089,7 +3091,8 @@ void wxGrid::HideCurrentCellHighlight( wxDC& dc )
// //
void wxGrid::ShowCurrentCellHighlight( wxDC& dc ) void wxGrid::ShowCurrentCellHighlight( wxDC& dc )
{ {
if ( !m_currentCellHighlighted && if ( !m_cellEditCtrlEnabled &&
!m_currentCellHighlighted &&
m_currentCellCoords != wxGridNoCellCoords ) m_currentCellCoords != wxGridNoCellCoords )
{ {
DrawCellHighlight( dc, m_currentCellCoords ); DrawCellHighlight( dc, m_currentCellCoords );
@@ -3587,6 +3590,9 @@ void wxGrid::EnableCellEditControl( bool enable )
if ( m_cellEditCtrl && if ( m_cellEditCtrl &&
enable != m_cellEditCtrlEnabled ) enable != m_cellEditCtrlEnabled )
{ {
wxClientDC dc( this );
HideCurrentCellHighlight( dc );
HideCellEditControl(); HideCellEditControl();
SaveEditControlValue(); SaveEditControlValue();
@@ -3594,6 +3600,7 @@ void wxGrid::EnableCellEditControl( bool enable )
SetEditControlValue(); SetEditControlValue();
ShowCellEditControl(); ShowCellEditControl();
ShowCurrentCellHighlight( dc );
} }
} }