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

Fixed problem where corner label was displayed when either row or col label size had been set to zero prior to first display.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-02-09 08:09:19 +00:00
parent 7807d81c73
commit 18f9565d19
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/generic/grid.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/sizer.h"
#include "wx/layout.h"
#endif
@@ -950,29 +951,29 @@ void wxGrid::Create()
m_numCols = 0;
m_currentCellCoords = wxGridNoCellCoords;
int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-1,
wxPoint(0, 0),
wxSize(rowLblW, colLblH) );
wxDefaultPosition,
wxDefaultSize );
m_rowLabelWin = new wxGridRowLabelWindow( this,
-1,
wxPoint(0, colLblH),
wxSize(rowLblW, -1) );
wxDefaultPosition,
wxDefaultSize );
m_colLabelWin = new wxGridColLabelWindow( this,
-1,
wxPoint(rowLblW, 0),
wxSize(-1, colLblH ) );
wxDefaultPosition,
wxDefaultSize );
m_gridWin = new wxGridWindow( this,
m_rowLabelWin,
m_colLabelWin,
-1,
wxPoint(rowLblW, colLblH),
wxDefaultPosition,
wxDefaultSize );
SetTargetWindow( m_gridWin );
@@ -2398,6 +2399,10 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
}
// This is just here to make sure that CalcDimensions gets called when
// the grid view is resized... then the size event is skipped to allow
// the box sizers to handle everything
//
void wxGrid::OnSize( wxSizeEvent& event )
{
CalcWindowSizes();