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

minor cleanup 2 - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-04-26 02:48:26 +00:00
parent 1c9d49c661
commit 56b6cf265c
1 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/generic/grid.cpp
View File

@@ -3822,7 +3822,7 @@ END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id, wxWindowID id,
const wxPoint &pos, const wxSize &size ) const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE|wxFULL_REPAINT_ON_RESIZE ) : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
{ {
m_owner = parent; m_owner = parent;
} }
@@ -4909,7 +4909,8 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
#if defined(__WXMOTIF__) #if defined(__WXMOTIF__)
int cw, ch; int cw, ch;
m_gridWin->GetClientSize( &cw, &ch ); m_gridWin->GetClientSize( &cw, &ch );
if ( r.GetTop() > ch ) r.SetTop( 0 ); if ( r.GetTop() > ch )
r.SetTop( 0 );
r.SetBottom( wxMin( r.GetBottom(), ch ) ); r.SetBottom( wxMin( r.GetBottom(), ch ) );
#endif #endif
@@ -4959,7 +4960,8 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg )
#if defined(__WXMOTIF__) #if defined(__WXMOTIF__)
int cw, ch; int cw, ch;
m_gridWin->GetClientSize( &cw, &ch ); m_gridWin->GetClientSize( &cw, &ch );
if ( r.GetLeft() > cw ) r.SetLeft( 0 ); if ( r.GetLeft() > cw )
r.SetLeft( 0 );
r.SetRight( wxMin( r.GetRight(), cw ) ); r.SetRight( wxMin( r.GetRight(), cw ) );
#endif #endif
@@ -6945,9 +6947,9 @@ bool wxGrid::SetModelValues()
if ( m_table ) if ( m_table )
{ {
for ( row = 0; row < m_numRows; row++ ) for ( row = 0; row < m_numRows; row++ )
{ {
for ( col = 0; col < m_numCols; col++ ) for ( col = 0; col < m_numCols; col++ )
{ {
m_table->SetValue( row, col, GetCellValue(row, col) ); m_table->SetValue( row, col, GetCellValue(row, col) );
} }
@@ -6983,7 +6985,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
{ {
wxGridCellCoords cell( row + cell_rows, col + cell_cols ); wxGridCellCoords cell( row + cell_rows, col + cell_cols );
bool marked = false; bool marked = false;
for ( int j = 0; j < numCells; j++ ) for ( int j = 0; j < numCells; j++ )
{ {
if ( cell == cells[j] ) if ( cell == cells[j] )
{ {
@@ -7017,7 +7019,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
{ {
for ( int l = 0; l < cell_rows; l++ ) for ( int l = 0; l < cell_rows; l++ )
{ {
// find a cell in this row to left alreay marked for repaint // find a cell in this row to leave already marked for repaint
int left = col; int left = col;
for (int k = 0; k < int(redrawCells.GetCount()); k++) for (int k = 0; k < int(redrawCells.GetCount()); k++)
if ((redrawCells[k].GetCol() < left) && if ((redrawCells[k].GetCol() < left) &&
@@ -7073,7 +7075,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
numCells = redrawCells.GetCount(); numCells = redrawCells.GetCount();
for ( i = numCells - 1; i >= 0; i-- ) for ( i = numCells - 1; i >= 0; i-- )
{ {
DrawCell( dc, redrawCells[i] ); DrawCell( dc, redrawCells[i] );
} }
@@ -7173,10 +7175,10 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
if (penWidth > 0) if (penWidth > 0)
{ {
// The center of th drawn line is where the position/width/height of // The center of the drawn line is where the position/width/height of
// the rectangle is actually at, (on wxMSW at least,) so we will // the rectangle is actually at (on wxMSW at least), so the
// reduce the size of the rectangle to compensate for the thickness of // size of the rectangle is reduced to compensate for the thickness of
// the line. If this is too strange on non wxMSW platforms then // the line. If this is too strange on non-wxMSW platforms then
// please #ifdef this appropriately. // please #ifdef this appropriately.
rect.x += penWidth / 2; rect.x += penWidth / 2;
rect.y += penWidth / 2; rect.y += penWidth / 2;
@@ -7477,7 +7479,7 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols )
size_t i; size_t i;
size_t numLabels = cols.GetCount(); size_t numLabels = cols.GetCount();
for ( i = 0; i < numLabels; i++ ) for ( i = 0; i < numLabels; i++ )
{ {
DrawColLabel( dc, cols[i] ); DrawColLabel( dc, cols[i] );
} }
@@ -7689,7 +7691,7 @@ void wxGrid::GetTextBoxSize( const wxDC& dc,
long lineW = 0, lineH = 0; long lineW = 0, lineH = 0;
size_t i; size_t i;
for ( i = 0; i < lines.GetCount(); i++ ) for ( i = 0; i < lines.GetCount(); i++ )
{ {
dc.GetTextExtent( lines[i], &lineW, &lineH ); dc.GetTextExtent( lines[i], &lineW, &lineH );
w = wxMax( w, lineW ); w = wxMax( w, lineW );
@@ -8276,7 +8278,7 @@ void wxGrid::MakeCellVisible( int row, int col )
{ {
int h = r.GetHeight(); int h = r.GetHeight();
ypos = r.GetTop(); ypos = r.GetTop();
for ( i = row - 1; i >= 0; i-- ) for ( i = row - 1; i >= 0; i-- )
{ {
int rowHeight = GetRowHeight(i); int rowHeight = GetRowHeight(i);
if ( h + rowHeight > ch ) if ( h + rowHeight > ch )
@@ -8287,11 +8289,11 @@ void wxGrid::MakeCellVisible( int row, int col )
} }
// we divide it later by GRID_SCROLL_LINE, make sure that we don't // we divide it later by GRID_SCROLL_LINE, make sure that we don't
// have rounding errors (this is important, because if we do, we // have rounding errors (this is important, because if we do,
// might not scroll at all and some cells won't be redrawn) // we might not scroll at all and some cells won't be redrawn)
// //
// Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full // Sometimes GRID_SCROLL_LINE / 2 is not enough,
// scroll unit... // so just add a full scroll unit...
ypos += m_scrollLineY; ypos += m_scrollLineY;
} }
@@ -9776,7 +9778,7 @@ void wxGrid::SetRowSize( int row, int height )
m_rowHeights[row] = h; m_rowHeights[row] = h;
int i; int i;
for ( i = row; i < m_numRows; i++ ) for ( i = row; i < m_numRows; i++ )
{ {
m_rowBottoms[i] += diff; m_rowBottoms[i] += diff;
} }
@@ -9823,16 +9825,16 @@ void wxGrid::SetColSize( int col, int width )
InitColWidths(); InitColWidths();
} }
// if < 0 calc new width from label // if < 0 then calculate new width from label
if ( width < 0 ) if ( width < 0 )
{ {
long w, h; long w, h;
wxArrayString lines; wxArrayString lines;
wxClientDC dc(m_colLabelWin); wxClientDC dc(m_colLabelWin);
dc.SetFont(GetLabelFont()); dc.SetFont(GetLabelFont());
StringToLines(GetColLabelValue(col), lines); StringToLines(GetColLabelValue(col), lines);
GetTextBoxSize(dc, lines, &w, &h); GetTextBoxSize(dc, lines, &w, &h);
width = w + 6; width = w + 6;
} }
int w = wxMax( 0, width ); int w = wxMax( 0, width );
@@ -9840,7 +9842,7 @@ void wxGrid::SetColSize( int col, int width )
m_colWidths[col] = w; m_colWidths[col] = w;
int i; int i;
for ( i = col; i < m_numCols; i++ ) for ( i = col; i < m_numCols; i++ )
{ {
m_colRights[i] += diff; m_colRights[i] += diff;
} }
@@ -9945,9 +9947,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col); wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
extent = column ? size.x : size.y; extent = column ? size.x : size.y;
if ( extent > extentMax ) if ( extent > extentMax )
{
extentMax = extent; extentMax = extent;
}
renderer->DecRef(); renderer->DecRef();
} }
@@ -9970,9 +9970,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
extent = column ? w : h; extent = column ? w : h;
if ( extent > extentMax ) if ( extent > extentMax )
{
extentMax = extent; extentMax = extent;
}
if ( !extentMax ) if ( !extentMax )
{ {
@@ -10039,9 +10037,7 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
for ( int col = 0; col < m_numCols; col++ ) for ( int col = 0; col < m_numCols; col++ )
{ {
if ( !calcOnly ) if ( !calcOnly )
{
AutoSizeColumn(col, setAsMin); AutoSizeColumn(col, setAsMin);
}
width += GetColWidth(col); width += GetColWidth(col);
} }