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

Initializing more variables in wxGrid::Create()

Browse Source 
Minor fixes for crashes under wxMotif when setting attributes before
the grid has been first painted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward 2000-02-09 05:04:21 +00:00
parent b0d6ff2f7f
commit 4634a5d6d7
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,7 +449,7 @@ public:
void DrawGridCellArea( wxDC& dc );
void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
void DrawAllGridLines( wxDC& dc, const wxRegion & reg = wxRegion() );
void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
void DrawCell( wxDC& dc, const wxGridCellCoords& );
void DrawCellBackground( wxDC& dc, const wxGridCellCoords& );
void DrawCellValue( wxDC& dc, const wxGridCellCoords& );
@ -859,6 +859,7 @@ public:
protected:
bool m_created;
bool m_displayed;
wxGridWindow *m_gridWin;
wxGridRowLabelWindow *m_rowLabelWin;

36
src/generic/grid.cpp
View File

@ -940,6 +940,16 @@ wxGrid::~wxGrid()
void wxGrid::Create()
{
m_created = FALSE; // set to TRUE by CreateGrid
m_displayed = FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL;
m_cellEditCtrl = (wxWindow *) NULL;
m_numRows = 0;
m_numCols = 0;
m_currentCellCoords = wxGridNoCellCoords;
int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
@ -1119,6 +1129,10 @@ void wxGrid::Init()
void wxGrid::CalcDimensions()
{
// This avoids a crash in SetScrollbars
//
if ( !m_displayed ) return;
int cw, ch;
GetClientSize( &cw, &ch );
@ -2381,6 +2395,8 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
SetEditControlValue();
ShowCellEditControl();
}
m_displayed = TRUE;
}
@ -2540,10 +2556,8 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
return;
}
wxClientDC dc( m_gridWin );
PrepareDC( dc );
if ( m_currentCellCoords != wxGridNoCellCoords )
if ( m_displayed &&
m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
SaveEditControlValue();
@ -2552,13 +2566,17 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
m_currentCellCoords = coords;
SetEditControlValue();
ShowCellEditControl();
if ( IsSelection() )
if ( m_displayed )
{
wxRect r( SelectionToDeviceRect() );
ClearSelection();
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
ShowCellEditControl();
if ( IsSelection() )
{
wxRect r( SelectionToDeviceRect() );
ClearSelection();
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
}
}
}