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

Moved current cell initialization from wxGrid::OnPaint to

Browse Source 
wxGrid::DrawHighlight to accommodate wxGTK behaviour.

Removed redundant m_displayed member var from wxGrid.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward 2000-03-07 07:41:58 +00:00
parent 3f04dfd331
commit 2a7750d939
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/generic/grid.cpp
View File

@ -3090,7 +3090,6 @@ wxGrid::~wxGrid()
void wxGrid::Create() void wxGrid::Create()
{ {
m_created = FALSE; // set to TRUE by CreateGrid m_created = FALSE; // set to TRUE by CreateGrid
m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL; m_table = (wxGridTableBase *) NULL;
m_ownTable = FALSE; m_ownTable = FALSE;
@ -4966,15 +4965,6 @@ bool wxGrid::SendEvent( const wxEventType type,
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{ {
wxPaintDC dc( this ); wxPaintDC dc( this );
if ( m_currentCellCoords == wxGridNoCellCoords &&
m_numRows && m_numCols )
{
m_currentCellCoords.Set(0, 0);
ShowCellEditControl();
}
m_displayed = TRUE;
} }
@ -5170,8 +5160,7 @@ void wxGrid::OnEraseBackground(wxEraseEvent&)
void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
{ {
if ( m_displayed && if ( m_currentCellCoords != wxGridNoCellCoords )
m_currentCellCoords != wxGridNoCellCoords )
{ {
HideCellEditControl(); HideCellEditControl();
DisableCellEditControl(); DisableCellEditControl();
@ -5187,14 +5176,13 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
m_currentCellCoords = coords; m_currentCellCoords = coords;
if ( m_displayed ) wxClientDC dc(m_gridWin);
{ PrepareDC(dc);
wxClientDC dc(m_gridWin);
PrepareDC(dc); wxGridCellAttr* attr = GetCellAttr(coords);
DrawCellHighlight(dc, attr);
attr->DecRef();
wxGridCellAttr* attr = GetCellAttr(coords);
DrawCellHighlight(dc, attr);
attr->DecRef();
#if 0 #if 0
// SN: For my extended selection code, automatic // SN: For my extended selection code, automatic
// deselection is definitely not a good idea. // deselection is definitely not a good idea.
@ -5205,7 +5193,6 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
} }
#endif #endif
}
} }
@ -5408,6 +5395,15 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
void wxGrid::DrawHighlight(wxDC& dc) void wxGrid::DrawHighlight(wxDC& dc)
{ {
// This if block was previously in wxGrid::OnPaint but that doesn't
// seem to get called under wxGTK - MB
//
if ( m_currentCellCoords == wxGridNoCellCoords &&
m_numRows && m_numCols )
{
m_currentCellCoords.Set(0, 0);
}
if ( IsCellEditControlEnabled() ) if ( IsCellEditControlEnabled() )
{ {
// don't show highlight when the edit control is shown // don't show highlight when the edit control is shown