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

minor cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-25 17:04:30 +00:00
parent 68b4e4cff0
commit 3d59537f64
1 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/generic/grid.cpp
View File

@@ -4147,7 +4147,12 @@ wxGrid::~wxGrid()
void wxGrid::Create() void wxGrid::Create()
{ {
m_created = false; // set to true by CreateGrid // set to true by CreateGrid
m_created = false;
// create the type registry
m_typeRegistry = new wxGridTypeRegistry;
m_selection = NULL;
m_table = (wxGridTableBase *) NULL; m_table = (wxGridTableBase *) NULL;
m_ownTable = false; m_ownTable = false;
@@ -4185,16 +4190,7 @@ void wxGrid::Create()
m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
// create the type registry
m_typeRegistry = new wxGridTypeRegistry;
m_selection = NULL;
// subwindow components that make up the wxGrid // subwindow components that make up the wxGrid
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_rowLabelWin = new wxGridRowLabelWindow( this, m_rowLabelWin = new wxGridRowLabelWindow( this,
wxID_ANY, wxID_ANY,
wxDefaultPosition, wxDefaultPosition,
@@ -4205,6 +4201,11 @@ void wxGrid::Create()
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize ); wxDefaultSize );
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize );
m_gridWin = new wxGridWindow( this, m_gridWin = new wxGridWindow( this,
m_rowLabelWin, m_rowLabelWin,
m_colLabelWin, m_colLabelWin,
@@ -4542,7 +4543,6 @@ void wxGrid::CalcDimensions()
CalcWindowSizes(); CalcWindowSizes();
} }
void wxGrid::CalcWindowSizes() void wxGrid::CalcWindowSizes()
{ {
// escape if the window is has not been fully created yet // escape if the window is has not been fully created yet
@@ -4566,9 +4566,8 @@ void wxGrid::CalcWindowSizes()
m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight); m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw - m_rowLabelWidth, ch - m_colLabelHeight);
} }
// this is called when the grid table sends a message
// this is called when the grid table sends a message to say that it // to indicate that it has been redimensioned
// has been redimensioned
// //
bool wxGrid::Redimension( wxGridTableMessage& msg ) bool wxGrid::Redimension( wxGridTableMessage& msg )
{ {
@@ -4705,6 +4704,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
m_rowBottoms[i] = h; m_rowBottoms[i] = h;
} }
} }
if ( !m_numRows ) if ( !m_numRows )
{ {
m_currentCellCoords = wxGridNoCellCoords; m_currentCellCoords = wxGridNoCellCoords;
@@ -4721,6 +4721,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
if (attrProvider) if (attrProvider)
{ {
attrProvider->UpdateAttrRows( pos, -((int)numRows) ); attrProvider->UpdateAttrRows( pos, -((int)numRows) );
// ifdef'd out following patch from Paul Gammans // ifdef'd out following patch from Paul Gammans
#if 0 #if 0
// No need to touch column attributes, unless we // No need to touch column attributes, unless we
@@ -6381,7 +6382,8 @@ int wxGrid::SendEvent( const wxEventType type,
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{ {
wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW // needed to prevent zillions of paint events on MSW
wxPaintDC dc(this);
} }
void wxGrid::Refresh(bool eraseb, const wxRect* rect) void wxGrid::Refresh(bool eraseb, const wxRect* rect)