X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..ea8ca011a351c6aaa4009bedbf0cec19a7c57d98:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 2ab4374312..99090322c0 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -38,6 +38,7 @@ #include "wx/combobox.h" #include "wx/valtext.h" #include "wx/intl.h" + #include "wx/math.h" #endif #include "wx/textfile.h" @@ -206,7 +207,7 @@ public: wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ); - ~wxGridWindow(){} + ~wxGridWindow() {} void ScrollWindow( int dx, int dy, const wxRect *rect ); @@ -232,7 +233,6 @@ private: }; - class wxGridCellEditorEvtHandler : public wxEvtHandler { public: @@ -1022,7 +1022,7 @@ wxString wxGridCellNumberEditor::GetValue() const wxString s; #if wxUSE_SPINCTRL - if( HasRange() ) + if ( HasRange() ) { long value = Spin()->GetValue(); s.Printf(wxT("%ld"), value); @@ -1085,7 +1085,8 @@ bool wxGridCellFloatEditor::EndEdit(int row, int col, double value = 0.0; wxString text(Text()->GetValue()); - if ( (text.empty() || text.ToDouble(&value)) && (value != m_valueOld) ) + if ( (text.empty() || text.ToDouble(&value)) && + !wxIsSameDouble(value, m_valueOld) ) { if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT)) grid->GetTable()->SetValueAsDouble(row, col, value); @@ -1487,7 +1488,13 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) Combo()->SetFocus(); if (evtHandler) + { + // When dropping down the menu, a kill focus event + // happens after this point, so we can't reset the flag yet. +#if !defined(__WXGTK20__) evtHandler->SetInSetFocus(false); +#endif + } } bool wxGridCellChoiceEditor::EndEdit(int row, int col, @@ -1620,7 +1627,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid, dc.SetBackgroundMode( wxSOLID ); // grey out fields if the grid is disabled - if( grid.IsEnabled() ) + if ( grid.IsEnabled() ) { if ( isSelected ) { @@ -1654,7 +1661,7 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(const wxGrid& grid, // TODO some special colours for attr.IsReadOnly() case? // different coloured text when the grid is disabled - if( grid.IsEnabled() ) + if ( grid.IsEnabled() ) { if ( isSelected ) { @@ -1750,10 +1757,12 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, i--; break; } - if (rect.width >= best_width) break; + if (rect.width >= best_width) + break; } overflowCols = i - col - cell_cols + 1; - if (overflowCols >= cols) overflowCols = cols - 1; + if (overflowCols >= cols) + overflowCols = cols - 1; } if (overflowCols > 0) // redraw overflow cells w/ proper hilight @@ -2164,7 +2173,8 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) SetBackgroundColour(mergefrom->GetBackgroundColour()); if ( !HasFont() && mergefrom->HasFont() ) SetFont(mergefrom->GetFont()); - if ( !HasAlignment() && mergefrom->HasAlignment() ){ + if ( !HasAlignment() && mergefrom->HasAlignment() ) + { int hAlign, vAlign; mergefrom->GetAlignment( &hAlign, &vAlign); SetAlignment(hAlign, vAlign); @@ -2266,8 +2276,10 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const { if (HasAlignment()) { - if ( hAlign ) *hAlign = m_hAlign; - if ( vAlign ) *vAlign = m_vAlign; + if ( hAlign ) + *hAlign = m_hAlign; + if ( vAlign ) + *vAlign = m_vAlign; } else if (m_defGridAttr && m_defGridAttr != this) m_defGridAttr->GetAlignment(hAlign, vAlign); @@ -2279,8 +2291,10 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const { - if ( num_rows ) *num_rows = m_sizeRows; - if ( num_cols ) *num_cols = m_sizeCols; + if ( num_rows ) + *num_rows = m_sizeRows; + if ( num_cols ) + *num_cols = m_sizeCols; } // GetRenderer and GetEditor use a slightly different decision path about @@ -2457,7 +2471,8 @@ void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) // No need to DecRef the attribute itself since this is // done be wxGridCellWithAttr's destructor! m_attrs.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -2592,7 +2607,8 @@ void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols m_rowsOrCols.RemoveAt(n); m_attrs[n]->DecRef(); m_attrs.RemoveAt(n); - n--; count--; + n--; + count--; } } } @@ -2630,29 +2646,33 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, //Get cached merge attributes. // Currenlty not used as no cache implemented as not mutiable // attr = m_data->m_mergeAttr.GetAttr(row, col); - if(!attr) + if (!attr) { - //Basicaly implement old version. + //Basically implement old version. //Also check merge cache, so we don't have to re-merge every time.. wxGridCellAttr *attrcell = m_data->m_cellAttrs.GetAttr(row, col); wxGridCellAttr *attrrow = m_data->m_rowAttrs.GetAttr(row); wxGridCellAttr *attrcol = m_data->m_colAttrs.GetAttr(col); - if((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)){ + if ((attrcell != attrrow) && (attrrow != attrcol) && (attrcell != attrcol)) + { // Two or more are non NULL attr = new wxGridCellAttr; attr->SetKind(wxGridCellAttr::Merged); //Order important.. - if(attrcell){ + if (attrcell) + { attr->MergeWith(attrcell); attrcell->DecRef(); } - if(attrcol){ + if (attrcol) + { attr->MergeWith(attrcol); attrcol->DecRef(); } - if(attrrow){ + if (attrrow) + { attr->MergeWith(attrrow); attrrow->DecRef(); } @@ -2663,31 +2683,36 @@ wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, else { // one or none is non null return it or null. - if(attrrow) attr = attrrow; - if(attrcol) + if (attrrow) + attr = attrrow; + if (attrcol) { if(attr) attr->DecRef(); attr = attrcol; } - if(attrcell) + if (attrcell) { - if(attr) + if (attr) attr->DecRef(); attr = attrcell; } } } break; + case (wxGridCellAttr::Cell): attr = m_data->m_cellAttrs.GetAttr(row, col); break; + case (wxGridCellAttr::Col): attr = m_data->m_colAttrs.GetAttr(col); break; + case (wxGridCellAttr::Row): attr = m_data->m_rowAttrs.GetAttr(row); break; + default: // unused as yet... // (wxGridCellAttr::Default): @@ -2801,7 +2826,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_STRING, new wxGridCellStringRenderer, new wxGridCellTextEditor); - } else + } + else #endif // wxUSE_TEXTCTRL #if wxUSE_CHECKBOX if ( typeName == wxGRID_VALUE_BOOL ) @@ -2809,7 +2835,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_BOOL, new wxGridCellBoolRenderer, new wxGridCellBoolEditor); - } else + } + else #endif // wxUSE_CHECKBOX #if wxUSE_TEXTCTRL if ( typeName == wxGRID_VALUE_NUMBER ) @@ -2823,7 +2850,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_FLOAT, new wxGridCellFloatRenderer, new wxGridCellFloatEditor); - } else + } + else #endif // wxUSE_TEXTCTRL #if wxUSE_COMBOBOX if ( typeName == wxGRID_VALUE_CHOICE ) @@ -2831,7 +2859,8 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_CHOICE, new wxGridCellStringRenderer, new wxGridCellChoiceEditor); - } else + } + else #endif // wxUSE_COMBOBOX { return wxNOT_FOUND; @@ -3033,7 +3062,6 @@ bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), return false; } - wxString wxGridTableBase::GetRowLabelValue( int row ) { wxString s; @@ -3055,7 +3083,8 @@ wxString wxGridTableBase::GetColLabelValue( int col ) { s += (wxChar) (_T('A') + (wxChar)( col%26 )); col = col/26 - 1; - if ( col < 0 ) break; + if ( col < 0 ) + break; } // reverse the string... @@ -3068,7 +3097,6 @@ wxString wxGridTableBase::GetColLabelValue( int col ) return s2; } - wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) ) { return wxGRID_VALUE_STRING; @@ -3275,8 +3303,9 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) bool wxGridStringTable::AppendRows( size_t numRows ) { size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : - ( GetView() ? GetView()->GetNumberCols() : 0 ) ); + size_t curNumCols = ( curNumRows > 0 + ? m_data[0].GetCount() + : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); wxArrayString sa; if ( curNumCols > 0 ) @@ -3329,6 +3358,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) { m_data.RemoveAt( pos, numRows ); } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3347,8 +3377,9 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) size_t row, col; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : - ( GetView() ? GetView()->GetNumberCols() : 0 ) ); + size_t curNumCols = ( curNumRows > 0 + ? m_data[0].GetCount() + : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); if ( pos >= curNumCols ) { @@ -3362,6 +3393,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3443,6 +3475,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) m_data[row].RemoveAt( pos, numCols ); } } + if ( GetView() ) { wxGridTableMessage msg( this, @@ -3515,7 +3548,6 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) } - ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// @@ -3556,19 +3588,16 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->DrawRowLabels( dc , rows ); } - void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessRowLabelMouseEvent( event ); } - void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event ) { m_owner->GetEventHandler()->ProcessEvent(event); } - // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // @@ -3588,7 +3617,6 @@ void wxGridRowLabelWindow::OnChar( wxKeyEvent& event ) } - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow ) @@ -3628,7 +3656,6 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->DrawColLabels( dc , cols ); } - void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessColLabelMouseEvent( event ); @@ -3639,23 +3666,25 @@ void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event ) m_owner->GetEventHandler()->ProcessEvent(event); } - // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridColLabelWindow::OnChar( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } @@ -3710,13 +3739,11 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) #endif // __WXGTK__/!__WXGTK__ } - void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) { m_owner->ProcessCornerLabelMouseEvent( event ); } - void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) { m_owner->GetEventHandler()->ProcessEvent(event); @@ -3765,14 +3792,12 @@ wxGridWindow::wxGridWindow( wxGrid *parent, const wxSize &size ) : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN|wxFULL_REPAINT_ON_RESIZE, wxT("grid window") ) - { m_owner = parent; m_rowLabelWin = rowLblWin; m_colLabelWin = colLblWin; } - void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); @@ -3787,7 +3812,6 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) m_owner->DrawHighlight( dc , DirtyCells ); } - void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { wxWindow::ScrollWindow( dx, dy, rect ); @@ -3795,7 +3819,6 @@ void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) m_colLabelWin->ScrollWindow( dx, 0, rect ); } - void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) { if (event.ButtonDown(wxMOUSE_BTN_LEFT) && FindFocus() != this) @@ -3814,17 +3837,20 @@ void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) // void wxGridWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridWindow::OnChar( wxKeyEvent& event ) { - if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) + event.Skip(); } void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) @@ -4351,7 +4377,7 @@ void wxGrid::CalcDimensions() int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; // take into account editor if shown - if( IsCellEditControlShown() ) + if ( IsCellEditControlShown() ) { int w2, h2; int r = m_currentCellCoords.GetRow(); @@ -4365,8 +4391,10 @@ void wxGrid::CalcDimensions() editor->GetControl()->GetSize(&w2, &h2); w2 += x; h2 += y; - if( w2 > w ) w = w2; - if( h2 > h ) h = h2; + if ( w2 > w ) + w = w2; + if ( h2 > h ) + h = h2; editor->DecRef(); attr->DecRef(); } @@ -4560,7 +4588,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_selection ) m_selection->UpdateRows( pos, -((int)numRows) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) { + if (attrProvider) + { attrProvider->UpdateAttrRows( pos, -((int)numRows) ); // ifdef'd out following patch from Paul Gammans #if 0 @@ -4691,7 +4720,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_selection ) m_selection->UpdateCols( pos, -((int)numCols) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); - if (attrProvider) { + if (attrProvider) + { attrProvider->UpdateAttrCols( pos, -((int)numCols) ); // ifdef'd out following patch from Paul Gammans #if 0 @@ -5019,7 +5049,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // else if (event.LeftDClick() ) { - int row = YToEdgeOfRow(y); + row = YToEdgeOfRow(y); if ( row < 0 ) { row = YToRow(y); @@ -5243,7 +5273,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // if ( event.LeftDClick() ) { - int col = XToEdgeOfCol(x); + col = XToEdgeOfCol(x); if ( col < 0 ) { col = XToCol(x); @@ -5471,7 +5501,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { // Hide the edit control, so it - // won't interfer with drag-shrinking. + // won't interfere with drag-shrinking. if ( IsCellEditControlShown() ) { HideCellEditControl(); @@ -5773,7 +5803,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.Moving() && !event.IsButton() ) { - if( coords.GetRow() < 0 || coords.GetCol() < 0 ) + if ( coords.GetRow() < 0 || coords.GetCol() < 0 ) { // out of grid cell area ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); @@ -6204,7 +6234,9 @@ int wxGrid::SendEvent( const wxEventType type, } // A Veto'd event may not be `claimed' so test this first - if (vetoed) return -1; + if (vetoed) + return -1; + return claimed ? 1 : 0; } @@ -6242,11 +6274,12 @@ int wxGrid::SendEvent( const wxEventType type, } // A Veto'd event may not be `claimed' so test this first - if (vetoed) return -1; + if (vetoed) + return -1; + return claimed ? 1 : 0; } - void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW @@ -6259,7 +6292,7 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) if (! GetBatchCount()) { // Refresh to get correct scrolled position: - wxScrolledWindow::Refresh(eraseb,rect); + wxScrolledWindow::Refresh(eraseb, rect); if (rect) { @@ -6274,7 +6307,8 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect) rectHeight = rect->GetHeight(); width_label = m_rowLabelWidth - rect_x; - if (width_label > rectWidth) width_label = rectWidth; + if (width_label > rectWidth) + width_label = rectWidth; height_label = m_colLabelHeight - rect_y; if (height_label > rectHeight) height_label = rectHeight; @@ -6854,7 +6888,8 @@ bool wxGrid::SetModelValues() // void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numRows || !m_numCols ) + return; int i, numCells = cells.GetCount(); int row, col, cell_rows, cell_cols; @@ -6890,7 +6925,8 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) break; } } - if (!marked) redrawCells.Add( cell ); + if (!marked) + redrawCells.Add( cell ); } continue; // don't bother drawing this cell } @@ -6905,9 +6941,10 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) for (int k = 0; k < int(redrawCells.GetCount()); k++) if ((redrawCells[k].GetCol() < left) && (redrawCells[k].GetRow() == row)) - left=redrawCells[k].GetCol(); + left = redrawCells[k].GetCol(); - if (left == col) left = 0; // oh well + if (left == col) + left = 0; // oh well for (int j = col-1; j >= left; j--) { @@ -6926,6 +6963,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) break; } } + if (!marked) { int count = redrawCells.GetCount(); @@ -6937,7 +6975,8 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) break; } } - if (!marked) redrawCells.Add( cell ); + if (!marked) + redrawCells.Add( cell ); } } break; @@ -6945,6 +6984,7 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) } } } + DrawCell( dc, cells[i] ); } @@ -7052,16 +7092,16 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // reduce the size of the rectangle to compensate for the thickness of // the line. If this is too strange on non wxMSW platforms then // please #ifdef this appropriately. - rect.x += penWidth/2; - rect.y += penWidth/2; - rect.width -= penWidth-1; - rect.height -= penWidth-1; + rect.x += penWidth / 2; + rect.y += penWidth / 2; + rect.width -= penWidth - 1; + rect.height -= penWidth - 1; // Now draw the rectangle // use the cellHighlightColour if the cell is inside a selection, this // will ensure the cell is always visible. - dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID)); + dc.SetPen(wxPen(IsInSelection(row,col) ? m_selectionForeground : m_cellHighlightColour, penWidth, wxSOLID)); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle(rect); } @@ -7072,8 +7112,8 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // how to properly set colours for arbitrary bg? wxCoord x1 = rect.x, y1 = rect.y, - x2 = rect.x + rect.width -1, - y2 = rect.y + rect.height -1; + x2 = rect.x + rect.width - 1, + y2 = rect.y + rect.height - 1; dc.SetPen(*wxWHITE_PEN); dc.DrawLine(x1, y1, x2, y1); @@ -7156,7 +7196,8 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) if ( !m_gridLinesEnabled || !m_numRows || - !m_numCols ) return; + !m_numCols ) + return; int top, bottom, left, right; @@ -7268,7 +7309,6 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) } } - // vertical grid lines // for ( i = internalXToCol(left); i < m_numCols; i++ ) @@ -7287,10 +7327,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) dc.DestroyClippingRegion(); } - void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) { - if ( !m_numRows ) return; + if ( !m_numRows ) + return; size_t i; size_t numLabels = rows.GetCount(); @@ -7301,7 +7341,6 @@ void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) } } - void wxGrid::DrawRowLabel( wxDC& dc, int row ) { if ( GetRowHeight(row) <= 0 || m_rowLabelWidth <= 0 ) @@ -7349,10 +7388,10 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign ); } - void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) { - if ( !m_numCols ) return; + if ( !m_numCols ) + return; size_t i; size_t numLabels = cols.GetCount(); @@ -7363,7 +7402,6 @@ void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) } } - void wxGrid::DrawColLabel( wxDC& dc, int col ) { if ( GetColWidth(col) <= 0 || m_colLabelHeight <= 0 ) @@ -7423,7 +7461,6 @@ void wxGrid::DrawTextRectangle( wxDC& dc, StringToLines( value, lines ); - //Forward to new API. DrawTextRectangle( dc, lines, @@ -7448,12 +7485,12 @@ void wxGrid::DrawTextRectangle( wxDC& dc, dc.SetClippingRegion( rect ); nLines = lines.GetCount(); - if( nLines > 0 ) + if ( nLines > 0 ) { int l; float x = 0.0, y = 0.0; - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) GetTextBoxSize(dc, lines, &textWidth, &textHeight); else GetTextBoxSize( dc, lines, &textHeight, &textWidth ); @@ -7461,14 +7498,14 @@ void wxGrid::DrawTextRectangle( wxDC& dc, switch( vertAlign ) { case wxALIGN_BOTTOM: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + (rect.height - textHeight - 1); else x = rect.x + rect.width - textWidth; break; case wxALIGN_CENTRE: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + ((rect.height - textHeight)/2); else x = rect.x + ((rect.width - textWidth)/2); @@ -7476,7 +7513,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_TOP: default: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) y = rect.y + 1; else x = rect.x + 1; @@ -7484,21 +7521,21 @@ void wxGrid::DrawTextRectangle( wxDC& dc, } // Align each line of a multi-line label - for( l = 0; l < nLines; l++ ) + for ( l = 0; l < nLines; l++ ) { dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); switch( horizAlign ) { case wxALIGN_RIGHT: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + (rect.width - lineWidth - 1); else y = rect.y + lineWidth + 1; break; case wxALIGN_CENTRE: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + ((rect.width - lineWidth)/2); else y = rect.y + rect.height - ((rect.height - lineWidth)/2); @@ -7506,14 +7543,14 @@ void wxGrid::DrawTextRectangle( wxDC& dc, case wxALIGN_LEFT: default: - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) x = rect.x + 1; else y = rect.y + rect.height - 1; break; } - if( textOrientation == wxHORIZONTAL ) + if ( textOrientation == wxHORIZONTAL ) { dc.DrawText( lines[l], (int)x, (int)y ); y += lineHeight; @@ -7525,6 +7562,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc, } } } + dc.DestroyClippingRegion(); } @@ -7554,8 +7592,9 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { lines.Add( value.Mid(startPos, pos) ); } - startPos += pos+1; + startPos += pos + 1; } + if ( startPos < (int)value.Length() ) { lines.Add( value.Mid( startPos ) ); @@ -7623,23 +7662,23 @@ bool wxGrid::Enable(bool enable) return true; } + // // ------ Edit control functions // - void wxGrid::EnableEditing( bool edit ) { // TODO: improve this ? // if ( edit != m_editable ) { - if(!edit) EnableCellEditControl(edit); + if (!edit) + EnableCellEditControl(edit); m_editable = edit; } } - void wxGrid::EnableCellEditControl( bool enable ) { if (! m_editable) @@ -7805,6 +7844,7 @@ void wxGrid::ShowCellEditControl() NULL, NULL, &attr->GetFont()); if (maxWidth < rect.width) maxWidth = rect.width; } + int client_right = m_gridWin->GetClientSize().GetWidth(); if (rect.x+maxWidth > client_right) maxWidth = client_right - rect.x; @@ -7824,8 +7864,9 @@ void wxGrid::ShowCellEditControl() else break; } + if (rect.GetRight() > client_right) - rect.SetRight(client_right-1); + rect.SetRight(client_right - 1); } editor->SetCellAttr(attr); @@ -7845,7 +7886,6 @@ void wxGrid::ShowCellEditControl() } } - void wxGrid::HideCellEditControl() { if ( IsCellEditControlEnabled() ) @@ -7867,13 +7907,12 @@ void wxGrid::HideCellEditControl() rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x; #ifdef __WXMAC__ // ensure that the pixels under the focus ring get refreshed as well - rect.Inflate(10,10); + rect.Inflate(10, 10); #endif m_gridWin->Refresh( false, &rect ); } } - void wxGrid::SaveEditControlValue() { if ( IsCellEditControlEnabled() ) @@ -7881,7 +7920,7 @@ void wxGrid::SaveEditControlValue() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - wxString oldval = GetCellValue(row,col); + wxString oldval = GetCellValue(row, col); wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); @@ -7894,10 +7933,10 @@ void wxGrid::SaveEditControlValue() { if ( SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() ) < 0 ) { - + m_currentCellCoords.GetCol() ) < 0 ) + { // Event has been vetoed, set the data back. - SetCellValue(row,col,oldval); + SetCellValue(row, col, oldval); } } } @@ -7936,11 +7975,9 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, const wxArrayInt& BorderArray, int nMax, bool clipToMinMax) { - if (coord < 0) return clipToMinMax && (nMax > 0) ? 0 : -1; - if (!defaultDist) defaultDist = 1; @@ -7949,7 +7986,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, if (BorderArray.IsEmpty()) { - if((int) i_max < nMax) + if ((int) i_max < nMax) return i_max; return clipToMinMax ? nMax - 1 : -1; } @@ -7966,9 +8003,11 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, else i_max = BorderArray.GetCount() - 1; } + if ( i_max >= BorderArray.GetCount()) i_max = BorderArray.GetCount() - 1; } + if ( coord >= BorderArray[i_max]) return clipToMinMax ? (int)i_max : -1; if ( coord < BorderArray[0] ) @@ -7988,6 +8027,7 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, else i_min = median; } + return i_max; } @@ -7997,14 +8037,12 @@ int wxGrid::YToRow( int y ) m_minAcceptableRowHeight, m_rowBottoms, m_numRows, false); } - int wxGrid::XToCol( int x ) { return CoordToRowOrCol(x, m_defaultColWidth, m_minAcceptableColWidth, m_colRights, m_numCols, false); } - // return the row number that that the y coord is near the edge of, or // -1 if not near an edge // @@ -8019,14 +8057,13 @@ int wxGrid::YToEdgeOfRow( int y ) // close enough to lower or upper border, respectively. if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE ) return i; - else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE ) + else if ( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE ) return i - 1; } return -1; } - // return the col number that that the x coord is near the edge of, or // -1 if not near an edge // @@ -8041,14 +8078,13 @@ int wxGrid::XToEdgeOfCol( int x ) // close enough to right or left border, respectively. if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE ) return i; - else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE ) + else if ( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE ) return i - 1; } return -1; } - wxRect wxGrid::CellToRect( int row, int col ) { wxRect rect( -1, -1, -1, -1 ); @@ -8073,14 +8109,15 @@ wxRect wxGrid::CellToRect( int row, int col ) } // if grid lines are enabled, then the area of the cell is a bit smaller - if (m_gridLinesEnabled) { + if (m_gridLinesEnabled) + { rect.width -= 1; rect.height -= 1; } + return rect; } - bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) { // get the cell rectangle in logical coords @@ -8114,13 +8151,11 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) } } - // make the specified cell location visible by doing a minimal amount // of scrolling // void wxGrid::MakeCellVisible( int row, int col ) { - int i; int xpos = -1, ypos = -1; @@ -8226,6 +8261,7 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) } else return false; + return true; } @@ -8260,13 +8296,13 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) } else return false; + return true; } return false; } - bool wxGrid::MoveCursorLeft( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && @@ -8294,13 +8330,13 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) } else return false; + return true; } return false; } - bool wxGrid::MoveCursorRight( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && @@ -8328,16 +8364,17 @@ bool wxGrid::MoveCursorRight( bool expandSelection ) } else return false; + return true; } return false; } - bool wxGrid::MovePageUp() { - if ( m_currentCellCoords == wxGridNoCellCoords ) return false; + if ( m_currentCellCoords == wxGridNoCellCoords ) + return false; int row = m_currentCellCoords.GetRow(); if ( row > 0 ) @@ -8365,7 +8402,8 @@ bool wxGrid::MovePageUp() bool wxGrid::MovePageDown() { - if ( m_currentCellCoords == wxGridNoCellCoords ) return false; + if ( m_currentCellCoords == wxGridNoCellCoords ) + return false; int row = m_currentCellCoords.GetRow(); if ( (row+1) < m_numRows ) @@ -8407,7 +8445,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) while ( row > 0 ) { row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row-1, col) ) @@ -8418,7 +8457,8 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) while ( row > 0 ) { row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8447,6 +8487,7 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) ClearSelection(); SetCurrentCell( row, col ); } + return true; } @@ -8470,7 +8511,8 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) while ( row < m_numRows-1 ) { row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row+1, col) ) @@ -8481,7 +8523,8 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) while ( row < m_numRows-1 ) { row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8534,7 +8577,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) while ( col > 0 ) { col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row, col-1) ) @@ -8545,7 +8589,8 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) while ( col > 0 ) { col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8598,7 +8643,8 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) while ( col < m_numCols-1 ) { col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else if ( m_table->IsEmptyCell(row, col+1) ) @@ -8609,7 +8655,8 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) while ( col < m_numCols-1 ) { col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; + if ( !(m_table->IsEmptyCell(row, col)) ) + break; } } else @@ -8859,7 +8906,7 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert ) // void wxGrid::SetColLabelTextOrientation( int textOrientation ) { - if( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) + if ( textOrientation == wxHORIZONTAL || textOrientation == wxVERTICAL ) { m_colLabelTextOrientation = textOrientation; } @@ -8937,7 +8984,8 @@ void wxGrid::SetCellHighlightColour( const wxColour& colour ) void wxGrid::SetCellHighlightPenWidth(int width) { - if (m_cellHighlightPenWidth != width) { + if (m_cellHighlightPenWidth != width) + { m_cellHighlightPenWidth = width; // Just redrawing the cell highlight is not enough since that won't @@ -8953,7 +9001,8 @@ void wxGrid::SetCellHighlightPenWidth(int width) void wxGrid::SetCellHighlightROPenWidth(int width) { - if (m_cellHighlightROPenWidth != width) { + if (m_cellHighlightROPenWidth != width) + { m_cellHighlightROPenWidth = width; // Just redrawing the cell highlight is not enough since that won't @@ -9107,7 +9156,7 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const wxGridCellEditor *wxGrid::GetDefaultEditor() const { - return m_defaultCellAttr->GetEditor(NULL,0,0); + return m_defaultCellAttr->GetEditor(NULL, 0, 0); } // ---------------------------------------------------------------------------- @@ -9150,6 +9199,7 @@ bool wxGrid::GetCellOverflow( int row, int col ) wxGridCellAttr *attr = GetCellAttr(row, col); bool allow = attr->GetOverflow(); attr->DecRef(); + return allow; } @@ -9183,6 +9233,7 @@ bool wxGrid::IsReadOnly(int row, int col) const wxGridCellAttr* attr = GetCellAttr(row, col); bool isReadOnly = attr->IsReadOnly(); attr->DecRef(); + return isReadOnly; } @@ -9242,6 +9293,7 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const #ifdef DEBUG_ATTR_CACHE gs_nAttrCacheMisses++; #endif + return false; } } @@ -9260,6 +9312,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const CacheAttr(row, col, attr); } } + if (attr) { attr->SetDefAttr(m_defaultCellAttr); @@ -9322,7 +9375,7 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision) void wxGrid::SetColFormatCustom(int col, const wxString& typeName) { wxGridCellAttr *attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); - if(!attr) + if (!attr) attr = new wxGridCellAttr; wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); attr->SetRenderer(renderer); @@ -9543,7 +9596,10 @@ wxGrid::GetDefaultEditorForType(const wxString& typeName) const int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxFAIL_MSG(wxT("Unknown data type name")); + wxString errStr; + + errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); + wxFAIL_MSG(errStr.c_str()); return NULL; } @@ -9557,7 +9613,10 @@ wxGrid::GetDefaultRendererForType(const wxString& typeName) const int index = m_typeRegistry->FindOrCloneDataType(typeName); if ( index == wxNOT_FOUND ) { - wxFAIL_MSG(wxT("Unknown data type name")); + wxString errStr; + + errStr.Printf(wxT("Unknown data type name [%s]"), typeName.c_str()); + wxFAIL_MSG(errStr.c_str()); return NULL; } @@ -9575,7 +9634,6 @@ void wxGrid::EnableDragRowSize( bool enable ) m_canDragRowSize = enable; } - void wxGrid::EnableDragColSize( bool enable ) { m_canDragColSize = enable; @@ -9613,7 +9671,8 @@ void wxGrid::SetRowSize( int row, int height ) wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") ); // See comment in SetColSize - if ( height < GetRowMinimalAcceptableHeight()) { return; } + if ( height < GetRowMinimalAcceptableHeight()) + return; if ( m_rowHeights.IsEmpty() ) { @@ -9663,7 +9722,8 @@ void wxGrid::SetColSize( int col, int width ) // // This test then fixes sf.net bug #645734 - if ( width < GetColMinimalAcceptableWidth()) { return; } + if ( width < GetColMinimalAcceptableWidth()) + return; if ( m_colWidths.IsEmpty() ) { @@ -9672,7 +9732,7 @@ void wxGrid::SetColSize( int col, int width ) } // if < 0 calc new width from label - if( width < 0 ) + if ( width < 0 ) { long w, h; wxArrayString lines; @@ -9695,10 +9755,10 @@ void wxGrid::SetColSize( int col, int width ) CalcDimensions(); } - void wxGrid::SetColMinimalWidth( int col, int width ) { - if (width > GetColMinimalAcceptableWidth()) { + if (width > GetColMinimalAcceptableWidth()) + { wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)col; m_colMinWidths[key] = width; } @@ -9706,7 +9766,8 @@ void wxGrid::SetColMinimalWidth( int col, int width ) void wxGrid::SetRowMinimalHeight( int row, int width ) { - if (width > GetRowMinimalAcceptableHeight()) { + if (width > GetRowMinimalAcceptableHeight()) + { wxLongToLongHashMap::key_type key = (wxLongToLongHashMap::key_type)row; m_rowMinHeights[key] = width; } @@ -9730,7 +9791,7 @@ void wxGrid::SetColMinimalAcceptableWidth( int width ) { // We do allow a width of 0 since this gives us // an easy way to temporarily hidding columns. - if ( width<0 ) + if ( width < 0 ) return; m_minAcceptableColWidth = width; } @@ -9739,7 +9800,7 @@ void wxGrid::SetRowMinimalAcceptableHeight( int height ) { // We do allow a height of 0 since this gives us // an easy way to temporarily hidding rows. - if ( height<0 ) + if ( height < 0 ) return; m_minAcceptableRowHeight = height; } @@ -9807,7 +9868,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) { dc.GetTextExtent( GetColLabelValue(col), &w, &h ); - if( GetColLabelTextOrientation() == wxVERTICAL ) + if ( GetColLabelTextOrientation() == wxVERTICAL ) w = h; } else @@ -10000,8 +10061,8 @@ void wxGrid::AutoSizeRowLabelSize( int row ) long w, h; // Hide the edit control, so it - // won't interfer with drag-shrinking. - if( IsCellEditControlShown() ) + // won't interfere with drag-shrinking. + if ( IsCellEditControlShown() ) { HideCellEditControl(); SaveEditControlValue(); @@ -10011,7 +10072,7 @@ void wxGrid::AutoSizeRowLabelSize( int row ) StringToLines( GetRowLabelValue( row ), lines ); wxClientDC dc( m_rowLabelWin ); GetTextBoxSize( dc, lines, &w, &h); - if( h < m_defaultRowHeight ) + if ( h < m_defaultRowHeight ) h = m_defaultRowHeight; SetRowSize(row, h); ForceRefresh(); @@ -10024,7 +10085,7 @@ void wxGrid::AutoSizeColLabelSize( int col ) // Hide the edit control, so it // won't interfer with drag-shrinking. - if( IsCellEditControlShown() ) + if ( IsCellEditControlShown() ) { HideCellEditControl(); SaveEditControlValue(); @@ -10033,11 +10094,11 @@ void wxGrid::AutoSizeColLabelSize( int col ) // autosize column width depending on label text StringToLines( GetColLabelValue( col ), lines ); wxClientDC dc( m_colLabelWin ); - if( GetColLabelTextOrientation() == wxHORIZONTAL ) + if ( GetColLabelTextOrientation() == wxHORIZONTAL ) GetTextBoxSize( dc, lines, &w, &h); else GetTextBoxSize( dc, lines, &h, &w); - if( w < m_defaultColWidth ) + if ( w < m_defaultColWidth ) w = m_defaultColWidth; SetColSize(col, w); ForceRefresh(); @@ -10052,11 +10113,14 @@ wxSize wxGrid::DoGetBestSize() const width = self->SetOrCalcColumnSizes(true); height = self->SetOrCalcRowSizes(true); - if (!width) width=100; - if (!height) height=80; + if (!width) + width = 100; + if (!height) + height = 80; - // Round up to a multiple the scroll rate NOTE: this still doesn't get rid - // of the scrollbars, is there any magic incantaion for that? + // Round up to a multiple the scroll rate + // NOTE: this still doesn't get rid of the scrollbars; + // is there any magic incantation for that? int xpu, ypu; GetScrollPixelsPerUnit(&xpu, &ypu); if (xpu) @@ -10066,12 +10130,13 @@ wxSize wxGrid::DoGetBestSize() const // limit to 1/4 of the screen size int maxwidth, maxheight; - wxDisplaySize( & maxwidth, & maxheight ); + wxDisplaySize( &maxwidth, &maxheight ); maxwidth /= 2; maxheight /= 2; - if ( width > maxwidth ) width = maxwidth; - if ( height > maxheight ) height = maxheight; - + if ( width > maxwidth ) + width = maxwidth; + if ( height > maxheight ) + height = maxheight; wxSize best(width, height); // NOTE: This size should be cached, but first we need to add calls to @@ -10086,7 +10151,6 @@ void wxGrid::Fit() AutoSize(); } - wxPen& wxGrid::GetDividerPen() const { return wxNullPen; @@ -10138,7 +10202,6 @@ void wxGrid::SelectRow( int row, bool addToSelected ) m_selection->SelectRow( row, false, addToSelected ); } - void wxGrid::SelectCol( int col, bool addToSelected ) { if ( IsSelection() && !addToSelected ) @@ -10148,7 +10211,6 @@ void wxGrid::SelectCol( int col, bool addToSelected ) m_selection->SelectCol( col, false, addToSelected ); } - void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, bool addToSelected ) { @@ -10160,7 +10222,6 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, false, addToSelected ); } - void wxGrid::SelectAll() { if ( m_numRows > 0 && m_numCols > 0 ) @@ -10240,31 +10301,59 @@ bool wxGrid::IsInSelection( int row, int col ) const wxGridCellCoordsArray wxGrid::GetSelectedCells() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_cellSelection; } + wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_blockSelectionTopLeft; } + wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const { - if (!m_selection) { wxGridCellCoordsArray a; return a; } + if (!m_selection) + { + wxGridCellCoordsArray a; + return a; + } + return m_selection->m_blockSelectionBottomRight; } + wxArrayInt wxGrid::GetSelectedRows() const { - if (!m_selection) { wxArrayInt a; return a; } + if (!m_selection) + { + wxArrayInt a; + return a; + } + return m_selection->m_rowSelection; } + wxArrayInt wxGrid::GetSelectedCols() const { - if (!m_selection) { wxArrayInt a; return a; } + if (!m_selection) + { + wxArrayInt a; + return a; + } + return m_selection->m_colSelection; } - void wxGrid::ClearSelection() { m_selectingTopLeft = wxGridNoCellCoords; @@ -10320,7 +10409,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, left = right; right = i; i = leftCol; - leftCol=rightCol; + leftCol = rightCol; rightCol = i; } @@ -10339,7 +10428,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, { for ( i = leftCol; i <= rightCol; i++ ) { - if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol)) + if ((j == topRow) || (j == bottomRow) || (i == leftCol) || (i == rightCol)) { cellRect = CellToRect( j, i ); @@ -10352,7 +10441,10 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, if (cellRect.y + cellRect.height > bottom) bottom = cellRect.y + cellRect.height; } - else i = rightCol; // jump over inner cells. + else + { + i = rightCol; // jump over inner cells. + } } }