X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d82323930c8ce1b800f2213a598fbda79f868d1d..c3f4609ebb56f76065c28352d8db37f65a6fa35e:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index e5ab724cad..186c7ba70a 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -96,6 +96,26 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray) +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE) +DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN) + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -354,8 +374,10 @@ wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxRect wxGridNoCellRect( -1, -1, -1, -1 ); // scroll line size -// TODO: fixed so far - make configurable later (and also different for x/y) -static const size_t GRID_SCROLL_LINE = 10; +// TODO: this doesn't work at all, grid cells have different sizes and approx +// calculations don't work as because of the size mismatch scrollbars +// sometimes fail to be shown when they should be or vice versa +static const size_t GRID_SCROLL_LINE = 1; // the size of hash tables used a bit everywhere (the max number of elements // in these hash tables is the number of rows/columns) @@ -474,7 +496,7 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event) bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) { // accept the simple key presses, not anything with Ctrl/Alt/Meta - return !event.HasModifiers(); + return !(event.ControlDown() || event.AltDown()); } void wxGridCellEditor::StartingKey(wxKeyEvent& event) @@ -502,7 +524,8 @@ void wxGridCellTextEditor::Create(wxWindow* parent, m_control = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize #if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL + , wxTE_PROCESS_TAB | wxTE_MULTILINE | + wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL #endif ); @@ -538,7 +561,15 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) } #else // !GTK int extra_x = ( rect.x > 2 )? 2 : 1; + +// MB: treat MSW separately here otherwise the caret doesn't show +// when the editor is in the first row. +#if defined(__WXMSW__) + int extra_y = 2; +#else int extra_y = ( rect.y > 2 )? 2 : 1; +#endif // MSW + #if defined(__WXMOTIF__) extra_x *= 2; extra_y *= 2; @@ -1181,7 +1212,10 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) m_startValue = grid->GetTable()->GetValueAsBool(row, col); else - m_startValue = !!grid->GetTable()->GetValue(row, col); + { + wxString cellval( grid->GetTable()->GetValue(row, col) ); + m_startValue = !( !cellval || (cellval == "0") ); + } CBox()->SetValue(m_startValue); CBox()->SetFocus(); } @@ -1378,11 +1412,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) break; case WXK_TAB: - event.Skip( m_grid->ProcessEvent( event ) ); + event.Skip( m_grid->GetEventHandler()->ProcessEvent( event ) ); break; case WXK_RETURN: - if (!m_grid->ProcessEvent(event)) + case WXK_NUMPAD_ENTER: + if (!m_grid->GetEventHandler()->ProcessEvent(event)) m_editor->HandleReturn(event); break; @@ -1399,6 +1434,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) case WXK_ESCAPE: case WXK_TAB: case WXK_RETURN: + case WXK_NUMPAD_ENTER: break; default: @@ -1559,7 +1595,7 @@ void wxGridCellNumberRenderer::Draw(wxGrid& grid, // draw the text right aligned by default int hAlign, vAlign; attr.GetAlignment(&hAlign, &vAlign); - hAlign = wxRIGHT; + hAlign = wxALIGN_RIGHT; wxRect rect = rectCell; rect.Inflate(-1); @@ -1654,7 +1690,7 @@ void wxGridCellFloatRenderer::Draw(wxGrid& grid, // draw the text right aligned by default int hAlign, vAlign; attr.GetAlignment(&hAlign, &vAlign); - hAlign = wxRIGHT; + hAlign = wxALIGN_RIGHT; wxRect rect = rectCell; rect.Inflate(-1); @@ -1787,7 +1823,10 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) value = grid.GetTable()->GetValueAsBool(row, col); else - value = !!grid.GetTable()->GetValue(row, col); + { + wxString cellval( grid.GetTable()->GetValue(row, col) ); + value = !( !cellval || (cellval == "0") ); + } if ( value ) { @@ -2403,14 +2442,16 @@ int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName) wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) { wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; - renderer->IncRef(); + if (renderer) + renderer->IncRef(); return renderer; } wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) { wxGridCellEditor* editor = m_typeinfo[index]->m_editor; - editor->IncRef(); + if (editor) + editor->IncRef(); return editor; } @@ -3104,12 +3145,12 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) // void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3163,12 +3204,12 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) // void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3221,12 +3262,12 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) // void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3295,12 +3336,12 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) // void wxGridWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) @@ -3374,7 +3415,7 @@ void wxGrid::Create() // Set default cell attributes m_defaultCellAttr->SetFont(GetFont()); - m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP); + m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP); m_defaultCellAttr->SetTextColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); m_defaultCellAttr->SetBackgroundColour( @@ -3506,11 +3547,11 @@ void wxGrid::Init() m_labelFont = this->GetFont(); m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); - m_rowLabelHorizAlign = wxLEFT; - m_rowLabelVertAlign = wxCENTRE; + m_rowLabelHorizAlign = wxALIGN_LEFT; + m_rowLabelVertAlign = wxALIGN_CENTRE; - m_colLabelHorizAlign = wxCENTRE; - m_colLabelVertAlign = wxTOP; + m_colLabelHorizAlign = wxALIGN_CENTRE; + m_colLabelVertAlign = wxALIGN_TOP; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; m_defaultRowHeight = m_gridWin->GetCharHeight(); @@ -3640,19 +3681,44 @@ void wxGrid::CalcDimensions() int cw, ch; GetClientSize( &cw, &ch ); - if ( m_numRows > 0 || m_numCols > 0 ) - { - int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0; - int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0; + if ( m_colLabelWin->IsShown() ) + cw -= m_rowLabelWidth; + if ( m_rowLabelWin->IsShown() ) + ch -= m_colLabelHeight; - // TODO: restore the scroll position that we had before sizing - // - int x, y; - GetViewStart( &x, &y ); - SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, - right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE, - x, y ); + // grid total size + int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0; + int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; + + // preserve (more or less) the previous position + int x, y; + GetViewStart( &x, &y ); + // maybe we don't need scrollbars at all? and if we do, transform w and h + // from pixels into logical units + if ( w <= cw ) + { + w = 0; x= 0; + } + else + { + w = (w + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE; + if ( x >= w ) + x = w - 1; } + if ( h <= ch ) + { + h = 0; y = 0; + } + else + { + h = (h + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE; + if ( y >= h ) + y = h - 1; + } + + // do set scrollbar parameters + SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, + w, h, x, y, (GetBatchCount() != 0)); } @@ -3817,6 +3883,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrRows( pos, -((int)numRows) ); +// ifdef'd out following patch from Paul Gammans +#if 0 // No need to touch column attributes, unless we // removed _all_ rows, in this case, we remove // all column attributes. @@ -3824,6 +3892,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // needed data is not available inside UpdateAttrRows. if ( !GetNumberRows() ) attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); +#endif } if ( !GetBatchCount() ) { @@ -3950,6 +4019,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrCols( pos, -((int)numCols) ); +// ifdef'd out following patch from Paul Gammans +#if 0 // No need to touch row attributes, unless we // removed _all_ columns, in this case, we remove // all row attributes. @@ -3957,19 +4028,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // needed data is not available inside UpdateAttrCols. if ( !GetNumberCols() ) attrProvider->UpdateAttrRows( 0, -GetNumberRows() ); +#endif } if ( !GetBatchCount() ) { CalcDimensions(); m_colLabelWin->Refresh(); } - return TRUE; } -#if 0 -// There is no path to this code !!!!!! - result = TRUE; + result = TRUE; break; -#endif } if (result && !GetBatchCount() ) @@ -4569,7 +4637,9 @@ void wxGrid::ChangeCursorMode(CursorMode mode, cursorModes[m_cursorMode], cursorModes[mode]); #endif // __WXDEBUG__ - if ( mode == m_cursorMode ) + if ( mode == m_cursorMode && + win == m_winCapture && + captureMouse == (m_winCapture != NULL)) return; if ( !win ) @@ -4661,17 +4731,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( m_selectingKeyboard == wxGridNoCellCoords) m_selectingKeyboard = coords; - SelectBlock ( m_selectingKeyboard, coords ); + HighlightBlock ( m_selectingKeyboard, coords ); } else { if ( !IsSelection() ) { - SelectBlock( coords, coords ); + HighlightBlock( coords, coords ); } else { - SelectBlock( m_currentCellCoords, coords ); + HighlightBlock( m_currentCellCoords, coords ); } } @@ -4803,7 +4873,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) SetCurrentCell( coords ); if ( m_selection->GetSelectionMode() != wxGrid::wxGridSelectCells) - SelectBlock( coords, coords ); + HighlightBlock( coords, coords ); } m_waitForSlowClick = TRUE; } @@ -5240,13 +5310,12 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, rowOrCol, - mouseEv.GetX() + GetColLabelSize(), - mouseEv.GetY() + GetRowLabelSize(), + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), mouseEv.MetaDown() ); - return GetEventHandler()->ProcessEvent(gridEvt); } else if ( type == wxEVT_GRID_RANGE_SELECT ) @@ -5271,14 +5340,13 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, row, col, - mouseEv.GetX() + GetColLabelSize(), - mouseEv.GetY() + GetRowLabelSize(), + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), FALSE, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), mouseEv.MetaDown() ); - return GetEventHandler()->ProcessEvent(gridEvt); } } @@ -5399,6 +5467,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) break; case WXK_RETURN: + case WXK_NUMPAD_ENTER: if ( event.ControlDown() ) { event.Skip(); // to let the edit control have the return @@ -5582,7 +5651,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) HideCellEditControl(); DisableCellEditControl(); - if ( IsVisible( m_currentCellCoords ) ) + if ( IsVisible( m_currentCellCoords, FALSE ) ) { wxRect r; r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); @@ -5595,7 +5664,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) } CalcCellsExposed( r ); - + // Otherwise refresh redraws the highlight! m_currentCellCoords = coords; @@ -5612,6 +5681,140 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) } +void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol ) +{ + int temp; + wxGridCellCoords updateTopLeft, updateBottomRight; + + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) + { + leftCol = 0; + rightCol = GetNumberCols() - 1; + } + else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) + { + topRow = 0; + bottomRow = GetNumberRows() - 1; + } + if ( topRow > bottomRow ) + { + temp = topRow; + topRow = bottomRow; + bottomRow = temp; + } + + if ( leftCol > rightCol ) + { + temp = leftCol; + leftCol = rightCol; + rightCol = temp; + } + + updateTopLeft = wxGridCellCoords( topRow, leftCol ); + updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); + + if ( m_selectingTopLeft != updateTopLeft || + m_selectingBottomRight != updateBottomRight ) + { + // Compute two optimal update rectangles: + // Either one rectangle is a real subset of the + // other, or they are (almost) disjoint! + wxRect rect[4]; + bool need_refresh[4]; + need_refresh[0] = + need_refresh[1] = + need_refresh[2] = + need_refresh[3] = FALSE; + int i; + + // Store intermediate values + wxCoord oldLeft = m_selectingTopLeft.GetCol(); + wxCoord oldTop = m_selectingTopLeft.GetRow(); + wxCoord oldRight = m_selectingBottomRight.GetCol(); + wxCoord oldBottom = m_selectingBottomRight.GetRow(); + + // Determine the outer/inner coordinates. + if (oldLeft > leftCol) + { + temp = oldLeft; + oldLeft = leftCol; + leftCol = temp; + } + if (oldTop > topRow ) + { + temp = oldTop; + oldTop = topRow; + topRow = temp; + } + if (oldRight < rightCol ) + { + temp = oldRight; + oldRight = rightCol; + rightCol = temp; + } + if (oldBottom < bottomRow) + { + temp = oldBottom; + oldBottom = bottomRow; + bottomRow = temp; + } + + // Now, either the stuff marked old is the outer + // rectangle or we don't have a situation where one + // is contained in the other. + + if ( oldLeft < leftCol ) + { + need_refresh[0] = TRUE; + rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + oldLeft ), + wxGridCellCoords ( oldBottom, + leftCol - 1 ) ); + } + + if ( oldTop < topRow ) + { + need_refresh[1] = TRUE; + rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + leftCol ), + wxGridCellCoords ( topRow - 1, + rightCol ) ); + } + + if ( oldRight > rightCol ) + { + need_refresh[2] = TRUE; + rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + rightCol + 1 ), + wxGridCellCoords ( oldBottom, + oldRight ) ); + } + + if ( oldBottom > bottomRow ) + { + need_refresh[3] = TRUE; + rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, + leftCol ), + wxGridCellCoords ( oldBottom, + rightCol ) ); + } + + + // Change Selection + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; + + // various Refresh() calls + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); + } + + // never generate an event as it will be generated from + // wxGridSelection::SelectBlock! + // (old comment from when this was the body of SelectBlock) +} + // // ------ functions to get/send data (see also public functions) // @@ -6038,15 +6241,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc, float x, y; switch ( horizAlign ) { - case wxRIGHT: + case wxALIGN_RIGHT: x = rect.x + (rect.width - textWidth - 1); break; - case wxCENTRE: + case wxALIGN_CENTRE: x = rect.x + ((rect.width - textWidth)/2); break; - case wxLEFT: + case wxALIGN_LEFT: default: x = rect.x + 1; break; @@ -6054,15 +6257,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc, switch ( vertAlign ) { - case wxBOTTOM: + case wxALIGN_BOTTOM: y = rect.y + (rect.height - textHeight - 1); break; - case wxCENTRE: + case wxALIGN_CENTRE: y = rect.y + ((rect.height - textHeight)/2); break; - case wxTOP: + case wxALIGN_TOP: default: y = rect.y + 1; break; @@ -6174,12 +6377,8 @@ void wxGrid::EnableEditing( bool edit ) // if ( edit != m_editable ) { + if(!edit) EnableCellEditControl(edit); m_editable = edit; - - // FIXME IMHO this won't disable the edit control if edit == FALSE - // because of the check in the beginning of - // EnableCellEditControl() just below (VZ) - EnableCellEditControl(m_editable); } } @@ -6273,6 +6472,7 @@ void wxGrid::ShowCellEditControl() { if ( !IsVisible( m_currentCellCoords ) ) { + m_cellEditCtrlEnabled = FALSE; return; } else @@ -6612,7 +6812,7 @@ bool wxGrid::MoveCursorUp( bool expandSelection ) m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 ); MakeCellVisible( m_selectingKeyboard.GetRow(), m_selectingKeyboard.GetCol() ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } else if ( m_currentCellCoords.GetRow() > 0 ) @@ -6646,7 +6846,7 @@ bool wxGrid::MoveCursorDown( bool expandSelection ) m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 ); MakeCellVisible( m_selectingKeyboard.GetRow(), m_selectingKeyboard.GetCol() ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } else if ( m_currentCellCoords.GetRow() < m_numRows - 1 ) @@ -6680,7 +6880,7 @@ bool wxGrid::MoveCursorLeft( bool expandSelection ) m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 ); MakeCellVisible( m_selectingKeyboard.GetRow(), m_selectingKeyboard.GetCol() ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } else if ( m_currentCellCoords.GetCol() > 0 ) @@ -6714,7 +6914,7 @@ bool wxGrid::MoveCursorRight( bool expandSelection ) m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 ); MakeCellVisible( m_selectingKeyboard.GetRow(), m_selectingKeyboard.GetCol() ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } } else if ( m_currentCellCoords.GetCol() < m_numCols - 1 ) @@ -6844,7 +7044,7 @@ bool wxGrid::MoveCursorUpBlock( bool expandSelection ) if ( expandSelection ) { m_selectingKeyboard = wxGridCellCoords( row, col ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } else { @@ -6907,7 +7107,7 @@ bool wxGrid::MoveCursorDownBlock( bool expandSelection ) if ( expandSelection ) { m_selectingKeyboard = wxGridCellCoords( row, col ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } else { @@ -6971,7 +7171,7 @@ bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) if ( expandSelection ) { m_selectingKeyboard = wxGridCellCoords( row, col ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } else { @@ -7035,7 +7235,7 @@ bool wxGrid::MoveCursorRightBlock( bool expandSelection ) if ( expandSelection ) { m_selectingKeyboard = wxGridCellCoords( row, col ); - SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); } else { @@ -7185,12 +7385,27 @@ void wxGrid::SetLabelFont( const wxFont& font ) void wxGrid::SetRowLabelAlignment( int horiz, int vert ) { - if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) + // allow old (incorrect) defs to be used + switch ( horiz ) + { + case wxLEFT: horiz = wxALIGN_LEFT; break; + case wxRIGHT: horiz = wxALIGN_RIGHT; break; + case wxCENTRE: horiz = wxALIGN_CENTRE; break; + } + + switch ( vert ) + { + case wxTOP: vert = wxALIGN_TOP; break; + case wxBOTTOM: vert = wxALIGN_BOTTOM; break; + case wxCENTRE: vert = wxALIGN_CENTRE; break; + } + + if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) { m_rowLabelHorizAlign = horiz; } - if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) + if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) { m_rowLabelVertAlign = vert; } @@ -7203,12 +7418,27 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert ) void wxGrid::SetColLabelAlignment( int horiz, int vert ) { - if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) + // allow old (incorrect) defs to be used + switch ( horiz ) + { + case wxLEFT: horiz = wxALIGN_LEFT; break; + case wxRIGHT: horiz = wxALIGN_RIGHT; break; + case wxCENTRE: horiz = wxALIGN_CENTRE; break; + } + + switch ( vert ) + { + case wxTOP: vert = wxALIGN_TOP; break; + case wxBOTTOM: vert = wxALIGN_BOTTOM; break; + case wxCENTRE: vert = wxALIGN_CENTRE; break; + } + + if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) { m_colLabelHorizAlign = horiz; } - if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) + if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) { m_colLabelVertAlign = vert; } @@ -7230,7 +7460,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) if ( rect.height > 0 ) { CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); - rect.x = m_left; + rect.x = 0; rect.width = m_rowLabelWidth; m_rowLabelWin->Refresh( TRUE, &rect ); } @@ -7249,7 +7479,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s ) if ( rect.width > 0 ) { CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y); - rect.y = m_top; + rect.y = 0; rect.height = m_colLabelHeight; m_colLabelWin->Refresh( TRUE, &rect ); } @@ -7783,8 +8013,8 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) if ( resizeExistingRows ) { InitRowHeights(); - - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } } @@ -7807,7 +8037,8 @@ void wxGrid::SetRowSize( int row, int height ) { m_rowBottoms[i] += diff; } - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) @@ -7817,8 +8048,8 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) if ( resizeExistingCols ) { InitColWidths(); - - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } } @@ -7843,7 +8074,8 @@ void wxGrid::SetColSize( int col, int width ) { m_colRights[i] += diff; } - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } @@ -7918,7 +8150,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) dc.GetTextExtent( GetColLabelValue(col), &w, &h ); else - dc.GetTextExtent( GetRowLabelValue(col), &w, &h ); + dc.GetTextExtent( GetRowLabelValue(row), &w, &h ); extent = column ? w : h; if ( extent > extentMax ) @@ -7945,11 +8177,34 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) } } - if ( column ) + if ( column ){ SetColSize(col, extentMax); - else + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( 0, col ) ); + rect.y = 0; + CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); + rect.width = cw - rect.x; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + } + } + else{ SetRowSize(row, extentMax); - + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( row, 0 ) ); + rect.x = 0; + CalcScrolledPosition(0, rect.y, &dummy, &rect.y); + rect.width = m_rowLabelWidth; + rect.height = ch - rect.y; + m_rowLabelWin->Refresh( TRUE, &rect ); + } + } if ( setAsMin ) { if ( column ) @@ -7963,6 +8218,8 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { int width = m_rowLabelWidth; + if ( !calcOnly ) + BeginBatch(); for ( int col = 0; col < m_numCols; col++ ) { if ( !calcOnly ) @@ -7972,7 +8229,8 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) width += GetColWidth(col); } - + if ( !calcOnly ) + EndBatch(); return width; } @@ -7980,6 +8238,8 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) { int height = m_colLabelHeight; + if ( !calcOnly ) + BeginBatch(); for ( int row = 0; row < m_numRows; row++ ) { if ( !calcOnly ) @@ -7989,14 +8249,15 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) height += GetRowHeight(row); } - + if ( !calcOnly ) + EndBatch(); return height; } void wxGrid::AutoSize() { // set the size too - SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); + SetClientSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); } wxSize wxGrid::DoGetBestSize() const @@ -8071,142 +8332,67 @@ void wxGrid::SelectCol( int col, bool addToSelected ) } -void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) +void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, + bool addToSelected ) { - int temp; - wxGridCellCoords updateTopLeft, updateBottomRight; + if ( IsSelection() && !addToSelected ) + ClearSelection(); + m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, + FALSE, addToSelected ); +} + + +void wxGrid::SelectAll() +{ + if ( m_numRows > 0 && m_numCols > 0 ) + m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); +} + +// +// ------ Cell, row and col deselection +// + +void wxGrid::DeselectRow( int row ) +{ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) { - leftCol = 0; - rightCol = GetNumberCols() - 1; + if ( m_selection->IsInSelection(row, 0 ) ) + m_selection->ToggleCellSelection( row, 0); } - else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) - { - topRow = 0; - bottomRow = GetNumberRows() - 1; - } - if ( topRow > bottomRow ) + else { - temp = topRow; - topRow = bottomRow; - bottomRow = temp; + int nCols = GetNumberCols(); + for ( int i = 0; i < nCols ; i++ ) + { + if ( m_selection->IsInSelection(row, i ) ) + m_selection->ToggleCellSelection( row, i); + } } +} - if ( leftCol > rightCol ) +void wxGrid::DeselectCol( int col ) +{ + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) { - temp = leftCol; - leftCol = rightCol; - rightCol = temp; + if ( m_selection->IsInSelection(0, col ) ) + m_selection->ToggleCellSelection( 0, col); } - - updateTopLeft = wxGridCellCoords( topRow, leftCol ); - updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); - - if ( m_selectingTopLeft != updateTopLeft || - m_selectingBottomRight != updateBottomRight ) + else { - // Compute two optimal update rectangles: - // Either one rectangle is a real subset of the - // other, or they are (almost) disjoint! - wxRect rect[4]; - bool need_refresh[4]; - need_refresh[0] = - need_refresh[1] = - need_refresh[2] = - need_refresh[3] = FALSE; - int i; - - // Store intermediate values - wxCoord oldLeft = m_selectingTopLeft.GetCol(); - wxCoord oldTop = m_selectingTopLeft.GetRow(); - wxCoord oldRight = m_selectingBottomRight.GetCol(); - wxCoord oldBottom = m_selectingBottomRight.GetRow(); - - // Determine the outer/inner coordinates. - if (oldLeft > leftCol) - { - temp = oldLeft; - oldLeft = leftCol; - leftCol = temp; - } - if (oldTop > topRow ) + int nRows = GetNumberRows(); + for ( int i = 0; i < nRows ; i++ ) { - temp = oldTop; - oldTop = topRow; - topRow = temp; + if ( m_selection->IsInSelection(i, col ) ) + m_selection->ToggleCellSelection(i, col); } - if (oldRight < rightCol ) - { - temp = oldRight; - oldRight = rightCol; - rightCol = temp; - } - if (oldBottom < bottomRow) - { - temp = oldBottom; - oldBottom = bottomRow; - bottomRow = temp; - } - - // Now, either the stuff marked old is the outer - // rectangle or we don't have a situation where one - // is contained in the other. - - if ( oldLeft < leftCol ) - { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - oldLeft ), - wxGridCellCoords ( oldBottom, - leftCol - 1 ) ); - } - - if ( oldTop < topRow ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - leftCol ), - wxGridCellCoords ( topRow - 1, - rightCol ) ); - } - - if ( oldRight > rightCol ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - rightCol + 1 ), - wxGridCellCoords ( oldBottom, - oldRight ) ); - } - - if ( oldBottom > bottomRow ) - { - need_refresh[3] = TRUE; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, - leftCol ), - wxGridCellCoords ( oldBottom, - rightCol ) ); - } - - - // Change Selection - m_selectingTopLeft = updateTopLeft; - m_selectingBottomRight = updateBottomRight; - - // various Refresh() calls - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); } - - // never generate an event as it will be generated from - // wxGridSelection::SelectBlock! } -void wxGrid::SelectAll() +void wxGrid::DeselectCell( int row, int col ) { - m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); + if ( m_selection->IsInSelection(row, col) ) + m_selection->ToggleCellSelection(row, col); } bool wxGrid::IsSelection()