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@38984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-05-03 02:44:33 +00:00
parent 7e05216cce
commit c2f5b920ca
1 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/generic/grid.cpp
View File

@@ -188,9 +188,9 @@ class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
public: public:
wxGridWindow() wxGridWindow()
{ {
m_owner = (wxGrid *)NULL; m_owner = NULL;
m_rowLabelWin = (wxGridRowLabelWindow *)NULL; m_rowLabelWin = NULL;
m_colLabelWin = (wxGridColLabelWindow *)NULL; m_colLabelWin = NULL;
} }
wxGridWindow( wxGrid *parent, wxGridWindow( wxGrid *parent,
@@ -800,13 +800,13 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
else else
{ {
long tmp; long tmp;
if ( !params.ToLong(&tmp) ) if ( params.ToLong(&tmp) )
{ {
wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() ); m_maxChars = (size_t)tmp;
} }
else else
{ {
m_maxChars = (size_t)tmp; wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
} }
} }
} }
@@ -850,7 +850,7 @@ void wxGridCellNumberEditor::Create(wxWindow* parent,
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
#endif // wxUSE_VALIDATORS #endif
} }
} }
@@ -1043,7 +1043,7 @@ void wxGridCellFloatEditor::Create(wxWindow* parent,
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
#endif // wxUSE_VALIDATORS #endif
} }
void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
@@ -1309,7 +1309,7 @@ void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr)
void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!")); wxT("The wxGridCellEditor must be created first!"));
if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
{ {
@@ -1329,7 +1329,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
wxGrid* grid) wxGrid* grid)
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!")); wxT("The wxGridCellEditor must be created first!"));
bool changed = false; bool changed = false;
bool value = CBox()->GetValue(); bool value = CBox()->GetValue();
@@ -1350,7 +1350,7 @@ bool wxGridCellBoolEditor::EndEdit(int row, int col,
void wxGridCellBoolEditor::Reset() void wxGridCellBoolEditor::Reset()
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!")); wxT("The wxGridCellEditor must be created first!"));
CBox()->SetValue(m_startValue); CBox()->SetValue(m_startValue);
} }
@@ -1460,15 +1460,15 @@ void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell,
// flicker // flicker
// TODO: It doesn't actually fill the client area since the height of a // TODO: It doesn't actually fill the client area since the height of a
// combo always defaults to the standard... Until someone has time to // combo always defaults to the standard. Until someone has time to
// figure out the right rectangle to paint, just do it the normal way... // figure out the right rectangle to paint, just do it the normal way.
wxGridCellEditor::PaintBackground(rectCell, attr); wxGridCellEditor::PaintBackground(rectCell, attr);
} }
void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!")); wxT("The wxGridCellEditor must be created first!"));
wxGridCellEditorEvtHandler* evtHandler = NULL; wxGridCellEditorEvtHandler* evtHandler = NULL;
if (m_control) if (m_control)
@@ -1640,6 +1640,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
event.Skip(); event.Skip();
break; break;
} }
case WXK_END: case WXK_END:
{ {
if ( wholeCellVisible ) if ( wholeCellVisible )
@@ -1693,6 +1694,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
default: default:
event.Skip(); event.Skip();
break;
} }
} }
@@ -1764,21 +1766,21 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid,
// different coloured text when the grid is disabled // different coloured text when the grid is disabled
if ( grid.IsEnabled() ) if ( grid.IsEnabled() )
{ {
if ( isSelected ) if ( isSelected )
{ {
dc.SetTextBackground( grid.GetSelectionBackground() ); dc.SetTextBackground( grid.GetSelectionBackground() );
dc.SetTextForeground( grid.GetSelectionForeground() ); dc.SetTextForeground( grid.GetSelectionForeground() );
} }
else else
{ {
dc.SetTextBackground( attr.GetBackgroundColour() ); dc.SetTextBackground( attr.GetBackgroundColour() );
dc.SetTextForeground( attr.GetTextColour() ); dc.SetTextForeground( attr.GetTextColour() );
} }
} }
else else
{ {
dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); dc.SetTextBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT)); dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
} }
dc.SetFont( attr.GetFont() ); dc.SetFont( attr.GetFont() );
@@ -1854,7 +1856,9 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
} }
if (is_empty) if (is_empty)
{
rect.width += grid.GetColSize(i); rect.width += grid.GetColSize(i);
}
else else
{ {
i--; i--;
@@ -1876,10 +1880,10 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
wxRect clip = rect; wxRect clip = rect;
clip.x += rectCell.width; clip.x += rectCell.width;
// draw each overflow cell individually // draw each overflow cell individually
int col_end = col+cell_cols + overflowCols; int col_end = col + cell_cols + overflowCols;
if (col_end >= grid.GetNumberCols()) if (col_end >= grid.GetNumberCols())
col_end = grid.GetNumberCols() - 1; col_end = grid.GetNumberCols() - 1;
for (int i = col+cell_cols; i <= col_end; i++) for (int i = col + cell_cols; i <= col_end; i++)
{ {
clip.width = grid.GetColSize(i) - 1; clip.width = grid.GetColSize(i) - 1;
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
@@ -2160,7 +2164,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
// draw a border around checkmark // draw a border around checkmark
int vAlign, hAlign; int vAlign, hAlign;
attr.GetAlignment(& hAlign, &vAlign); attr.GetAlignment(&hAlign, &vAlign);
wxRect rectBorder; wxRect rectBorder;
if (hAlign == wxALIGN_CENTRE) if (hAlign == wxALIGN_CENTRE)
@@ -2187,7 +2191,9 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid,
bool value; bool value;
if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
{
value = grid.GetTable()->GetValueAsBool(row, col); value = grid.GetTable()->GetValueAsBool(row, col);
}
else else
{ {
wxString cellval( grid.GetTable()->GetValue(row, col) ); wxString cellval( grid.GetTable()->GetValue(row, col) );
@@ -2393,7 +2399,9 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
*vAlign = m_vAlign; *vAlign = m_vAlign;
} }
else if (m_defGridAttr && m_defGridAttr != this) else if (m_defGridAttr && m_defGridAttr != this)
{
m_defGridAttr->GetAlignment(hAlign, vAlign); m_defGridAttr->GetAlignment(hAlign, vAlign);
}
else else
{ {
wxFAIL_MSG(wxT("Missing default cell attribute")); wxFAIL_MSG(wxT("Missing default cell attribute"));
@@ -2413,11 +2421,11 @@ void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
// used, otherwise the default editor or renderer is fetched from the grid and // used, otherwise the default editor or renderer is fetched from the grid and
// used. It should be the default for the data type of the cell. If it is // used. It should be the default for the data type of the cell. If it is
// NULL (because the table has a type that the grid does not have in its // NULL (because the table has a type that the grid does not have in its
// registry,) then the grid's default editor or renderer is used. // registry), then the grid's default editor or renderer is used.
wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
{ {
wxGridCellRenderer *renderer; wxGridCellRenderer *renderer = NULL;
if ( m_renderer && this != m_defGridAttr ) if ( m_renderer && this != m_defGridAttr )
{ {
@@ -2433,14 +2441,10 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
// GetDefaultRendererForCell() will do IncRef() for us // GetDefaultRendererForCell() will do IncRef() for us
renderer = grid->GetDefaultRendererForCell(row, col); renderer = grid->GetDefaultRendererForCell(row, col);
} }
else
{
renderer = NULL;
}
if ( !renderer ) if ( renderer == NULL )
{ {
if (m_defGridAttr && this != m_defGridAttr ) if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
{ {
// if we still don't have one then use the grid default // if we still don't have one then use the grid default
// (no need for IncRef() here neither) // (no need for IncRef() here neither)
@@ -2465,7 +2469,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
// same as above, except for s/renderer/editor/g // same as above, except for s/renderer/editor/g
wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
{ {
wxGridCellEditor *editor; wxGridCellEditor *editor = NULL;
if ( m_editor && this != m_defGridAttr ) if ( m_editor && this != m_defGridAttr )
{ {
@@ -2481,14 +2485,10 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons
// GetDefaultEditorForCell() will do IncRef() for us // GetDefaultEditorForCell() will do IncRef() for us
editor = grid->GetDefaultEditorForCell(row, col); editor = grid->GetDefaultEditorForCell(row, col);
} }
else
{
editor = NULL;
}
if ( !editor ) if ( editor == NULL )
{ {
if ( m_defGridAttr && this != m_defGridAttr ) if ( (m_defGridAttr != NULL) && (m_defGridAttr != this) )
{ {
// if we still don't have one then use the grid default // if we still don't have one then use the grid default
// (no need for IncRef() here neither) // (no need for IncRef() here neither)
@@ -4099,7 +4099,7 @@ bool wxGrid::Create(wxWindow *parent, wxWindowID id,
long style, const wxString& name) long style, const wxString& name)
{ {
if (!wxScrolledWindow::Create(parent, id, pos, size, if (!wxScrolledWindow::Create(parent, id, pos, size,
style | wxWANTS_CHARS , name)) style | wxWANTS_CHARS, name))
return false; return false;
m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE); m_colMinWidths = wxLongToLongHashMap(GRID_HASH_SIZE);
@@ -4556,14 +4556,14 @@ void wxGrid::CalcWindowSizes()
if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() ) if ( m_cornerLabelWin && m_cornerLabelWin->IsShown() )
m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight );
if ( m_colLabelWin && m_colLabelWin->IsShown() ) if ( m_colLabelWin && m_colLabelWin->IsShown() )
m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight); m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw - m_rowLabelWidth, m_colLabelHeight );
if ( m_rowLabelWin && m_rowLabelWin->IsShown() ) if ( m_rowLabelWin && m_rowLabelWin->IsShown() )
m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight); m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch - m_colLabelHeight );
if ( m_gridWin && m_gridWin->IsShown() ) if ( m_gridWin && m_gridWin->IsShown() )
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
@@ -4783,7 +4783,6 @@ bool wxGrid::Redimension( wxGridTableMessage& msg )
CalcDimensions(); CalcDimensions();
m_colLabelWin->Refresh(); m_colLabelWin->Refresh();
} }
} }
result = true; result = true;
break; break;
@@ -7346,7 +7345,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
} }
} }
#else #else
wxRegion clippedcells( left , top, right - left, bottom - top); wxRegion clippedcells( left, top, right - left, bottom - top );
int i, j, cell_rows, cell_cols; int i, j, cell_rows, cell_cols;
wxRect rect; wxRect rect;
@@ -7411,7 +7410,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
} }
void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) void wxGrid::DrawRowLabels( wxDC& dc, const wxArrayInt& rows)
{ {
if ( !m_numRows ) if ( !m_numRows )
return; return;
@@ -8484,7 +8483,7 @@ bool wxGrid::MovePageUp()
if ( newRow == row ) if ( newRow == row )
{ {
//row > 0 , so newrow can never be less than 0 here. // row > 0, so newRow can never be less than 0 here.
newRow = row - 1; newRow = row - 1;
} }
@@ -8512,7 +8511,7 @@ bool wxGrid::MovePageDown()
int newRow = internalYToRow( y + ch ); int newRow = internalYToRow( y + ch );
if ( newRow == row ) if ( newRow == row )
{ {
// row < m_numRows , so newrow can't overflow here. // row < m_numRows, so newRow can't overflow here.
newRow = row + 1; newRow = row + 1;
} }
@@ -9403,7 +9402,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const
{ {
if ( !LookupAttr(row, col, &attr) ) if ( !LookupAttr(row, col, &attr) )
{ {
attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) attr = m_table ? m_table->GetAttr(row, col, wxGridCellAttr::Any)
: (wxGridCellAttr *)NULL; : (wxGridCellAttr *)NULL;
CacheAttr(row, col, attr); CacheAttr(row, col, attr);
} }
@@ -10170,7 +10169,7 @@ void wxGrid::AutoSizeColLabelSize( int col )
long w, h; long w, h;
// Hide the edit control, so it // Hide the edit control, so it
// won't interfer with drag-shrinking. // won't interfere with drag-shrinking.
if ( IsCellEditControlShown() ) if ( IsCellEditControlShown() )
{ {
HideCellEditControl(); HideCellEditControl();
@@ -10205,7 +10204,7 @@ wxSize wxGrid::DoGetBestSize() const
height = 80; height = 80;
// Round up to a multiple the scroll rate // Round up to a multiple the scroll rate
// NOTE: this still doesn't get rid of the scrollbars; // NOTE: this still doesn't get rid of the scrollbars;
// is there any magic incantation for that? // is there any magic incantation for that?
int xpu, ypu; int xpu, ypu;
GetScrollPixelsPerUnit(&xpu, &ypu); GetScrollPixelsPerUnit(&xpu, &ypu);