X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ceda4f536a79ee9c7dcf7db1c67750a8198aac7..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index c4a11e828c..d90cd83ef0 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3,7 +3,6 @@ // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling // Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,7 +79,22 @@ static const int EXPANDER_OFFSET = 1; // For the generic implementation, both the leaf nodes and the nodes are sorted for // fast search when needed static wxDataViewModel* g_model; -static int g_column = -2; + +// The column is either the index of the column to be used for sorting or one +// of the special values in this enum: +enum +{ + // Sort when we're thawed later. + SortColumn_OnThaw = -3, + + // Don't sort at all. + SortColumn_None = -2, + + // Sort using the model default sort order. + SortColumn_Default = -1 +}; + +static int g_column = SortColumn_None; static bool g_asending = true; // ---------------------------------------------------------------------------- @@ -146,6 +160,16 @@ void wxDataViewColumn::UpdateDisplay() } } +void wxDataViewColumn::UnsetAsSortKey() +{ + m_sort = false; + + if ( m_owner ) + m_owner->SetSortingColumnIndex(wxNOT_FOUND); + + UpdateDisplay(); +} + void wxDataViewColumn::SetSortOrder(bool ascending) { if ( !m_owner ) @@ -224,7 +248,7 @@ private: { const unsigned idx = event.GetColumn(); - if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) + if ( SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) return; // default handling for the column click is to sort by this column or @@ -254,12 +278,12 @@ private: owner->OnColumnChange(idx); - SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx); + SendEvent(wxEVT_DATAVIEW_COLUMN_SORTED, idx); } void OnRClick(wxHeaderCtrlEvent& event) { - if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, + if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, event.GetColumn()) ) event.Skip(); } @@ -347,7 +371,7 @@ public: static wxDataViewTreeNode* CreateRootNode() { wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem()); - n->SetHasChildren(true); + n->m_branchData = new BranchNodeData; n->m_branchData->open = true; return n; } @@ -416,6 +440,11 @@ public: void ToggleOpen() { + // We do not allow the (invisible) root node to be collapsed because + // there is no way to expand it again. + if ( !m_parent ) + return; + wxCHECK_RET( m_branchData != NULL, "can't open leaf node" ); int sum = 0; @@ -446,6 +475,11 @@ public: void SetHasChildren(bool has) { + // The invisible root item always has children, so ignore any attempts + // to change this. + if ( !m_parent ) + return; + if ( !has ) { wxDELETE(m_branchData); @@ -571,20 +605,50 @@ public: UpdateDisplay(); } + // Override the base class method to resort if needed, i.e. if + // SortPrepare() was called -- and ignored -- while we were frozen. + virtual void DoThaw() + { + if ( g_column == SortColumn_OnThaw ) + { + Resort(); + g_column = SortColumn_None; + } + + wxWindow::DoThaw(); + } + void SortPrepare() { g_model = GetModel(); + wxDataViewColumn* col = GetOwner()->GetSortingColumn(); if( !col ) { if (g_model->HasDefaultCompare()) - g_column = -1; + { + // See below for the explanation of IsFrozen() test. + if ( IsFrozen() ) + g_column = SortColumn_OnThaw; + else + g_column = SortColumn_Default; + } else - g_column = -2; + g_column = SortColumn_None; g_asending = true; return; } + + // Avoid sorting while the window is frozen, this allows to quickly add + // many items without resorting after each addition and only resort + // them all at once when the window is finally thawed, see above. + if ( IsFrozen() ) + { + g_column = SortColumn_OnThaw; + return; + } + g_column = col->GetModelColumn(); g_asending = col->IsSortOrderAscending(); } @@ -602,7 +666,7 @@ public: void OnPaint( wxPaintEvent &event ); void OnCharHook( wxKeyEvent &event ); void OnChar( wxKeyEvent &event ); - void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event); + void OnVerticalNavigation(int delta, const wxKeyEvent& event); void OnLeftKey(); void OnRightKey(); void OnMouse( wxMouseEvent &event ); @@ -668,6 +732,7 @@ public: void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } int GetRowHeight() const { return m_lineHeight; } + int GetDefaultRowHeight() const; // Some useful functions for row and item mapping wxDataViewItem GetItemByRow( unsigned int row ) const; @@ -1024,7 +1089,7 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state return true; } -bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell), +bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect), wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, @@ -1032,7 +1097,8 @@ bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell), { if ( mouseEvent ) { - // only react to clicks directly on the checkbox, not elsewhere in the same cell: + // Only react to clicks directly on the checkbox, not elsewhere in the + // same cell. if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) ) return false; } @@ -1387,16 +1453,8 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_currentCol = NULL; m_currentColSetByKeyboard = false; m_useCellFocus = false; - m_currentRow = 0; - -#ifdef __WXMSW__ - // We would like to use the same line height that Explorer uses. This is - // different from standard ListView control since Vista. - if ( wxGetWinVersion() >= wxWinVersion_Vista ) - m_lineHeight = wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height - else -#endif // __WXMSW__ - m_lineHeight = wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height + m_currentRow = (unsigned)-1; + m_lineHeight = GetDefaultRowHeight(); #if wxUSE_DRAG_AND_DROP m_dragCount = 0; @@ -1439,6 +1497,20 @@ wxDataViewMainWindow::~wxDataViewMainWindow() } +int wxDataViewMainWindow::GetDefaultRowHeight() const +{ +#ifdef __WXMSW__ + // We would like to use the same line height that Explorer uses. This is + // different from standard ListView control since Vista. + if ( wxGetWinVersion() >= wxWinVersion_Vista ) + return wxMax(16, GetCharHeight()) + 6; // 16 = mini icon height + else +#endif // __WXMSW__ + return wxMax(16, GetCharHeight()) + 1; // 16 = mini icon height +} + + + #if wxUSE_DRAG_AND_DROP bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) { @@ -1487,7 +1559,7 @@ wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxDataViewModel *model = GetModel(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( model ); @@ -1531,7 +1603,7 @@ bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) wxDataViewModel *model = GetModel(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( model ); @@ -1562,7 +1634,7 @@ wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoo wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() ); + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_DROP, m_owner->GetId() ); event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( model ); @@ -1695,11 +1767,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxDataViewModel *model = GetModel(); wxAutoBufferedPaintDC dc( this ); -#ifdef __WXMSW__ dc.SetBrush(GetOwner()->GetBackgroundColour()); dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRectangle(GetClientSize()); -#endif if ( IsEmpty() ) { @@ -1723,7 +1793,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // Send the event to wxDataViewCtrl itself. wxWindow * const parent = GetParent(); - wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId()); + wxDataViewEvent cache_event(wxEVT_DATAVIEW_CACHE_HINT, parent->GetId()); cache_event.SetEventObject(parent); cache_event.SetCache(item_start, item_last - 1); parent->ProcessWindowEvent(cache_event); @@ -2390,7 +2460,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, } // Change the current row to the last row if the current exceed the max row number - if( m_currentRow > GetRowCount() ) + if ( m_currentRow >= GetRowCount() ) ChangeCurrentRow(m_count - 1); GetOwner()->InvalidateColBestWidths(); @@ -2408,7 +2478,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) // Send event wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); le.SetModel(GetModel()); le.SetItem(item); @@ -2449,7 +2519,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i // Send event wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); le.SetModel(GetModel()); le.SetItem(item); @@ -2464,6 +2534,7 @@ bool wxDataViewMainWindow::Cleared() { DestroyTree(); m_selection.Clear(); + m_currentRow = (unsigned)-1; if (GetModel()) { @@ -2727,7 +2798,7 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item) { wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); + wxDataViewEvent le(wxEVT_DATAVIEW_SELECTION_CHANGED, parent->GetId()); le.SetEventObject(parent); le.SetModel(GetModel()); @@ -2994,6 +3065,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co { wxASSERT( !IsVirtualList() ); + if ( row == (unsigned)-1 ) + return NULL; + RowToTreeNodeJob job( row , -2, m_root ); Walker( m_root , job ); return job.GetResult(); @@ -3073,44 +3147,44 @@ void wxDataViewMainWindow::Expand( unsigned int row ) if (!node->HasChildren()) return; - if (!node->IsOpen()) - { - if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) - { - // Vetoed by the event handler. - return; - } + if (!node->IsOpen()) + { + if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) + { + // Vetoed by the event handler. + return; + } - node->ToggleOpen(); + node->ToggleOpen(); - // build the children of current node - if( node->GetChildNodes().empty() ) - { - SortPrepare(); - ::BuildTreeHelper(GetModel(), node->GetItem(), node); - } + // build the children of current node + if( node->GetChildNodes().empty() ) + { + SortPrepare(); + ::BuildTreeHelper(GetModel(), node->GetItem(), node); + } - // By expanding the node all row indices that are currently in the selection list - // and are greater than our node have become invalid. So we have to correct that now. - const unsigned rowAdjustment = node->GetSubTreeCount(); - for(unsigned i=0; iGetSubTreeCount(); + for(unsigned i=0; i row) - ChangeCurrentRow(m_currentRow + rowAdjustment); + if(m_currentRow > row) + ChangeCurrentRow(m_currentRow + rowAdjustment); - m_count = -1; - UpdateDisplay(); - // Send the expanded event - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); - } + m_count = -1; + UpdateDisplay(); + // Send the expanded event + SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + } } void wxDataViewMainWindow::Collapse(unsigned int row) @@ -3127,7 +3201,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row) if (node->IsOpen()) { - if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) ) + if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) ) { // Vetoed by the event handler. return; @@ -3183,7 +3257,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row) m_count = -1; UpdateDisplay(); - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem()); + SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,node->GetItem()); } } @@ -3610,13 +3684,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } else { - // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to + // Enter activates the item, i.e. sends wxEVT_DATAVIEW_ITEM_ACTIVATED to // it. Only if that event is not handled do we activate column renderer (which // is normally done by Space) or even inline editing. const wxDataViewItem item = GetItemByRow(m_currentRow); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, + wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); le.SetItem(item); le.SetEventObject(parent); @@ -3696,13 +3770,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; case WXK_UP: - if ( m_currentRow > 0 ) - OnVerticalNavigation( m_currentRow - 1, event ); + OnVerticalNavigation( -1, event ); break; case WXK_DOWN: - if ( m_currentRow + 1 < GetRowCount() ) - OnVerticalNavigation( m_currentRow + 1, event ); + OnVerticalNavigation( +1, event ); break; // Add the process for tree expanding/collapsing case WXK_LEFT: @@ -3714,37 +3786,19 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; case WXK_END: - { - if (!IsEmpty()) - OnVerticalNavigation( GetRowCount() - 1, event ); + OnVerticalNavigation( +(int)GetRowCount(), event ); break; - } + case WXK_HOME: - if (!IsEmpty()) - OnVerticalNavigation( 0, event ); + OnVerticalNavigation( -(int)GetRowCount(), event ); break; case WXK_PAGEUP: - { - int steps = pageSize - 1; - int index = m_currentRow - steps; - if (index < 0) - index = 0; - - OnVerticalNavigation( index, event ); - } + OnVerticalNavigation( -(pageSize - 1), event ); break; case WXK_PAGEDOWN: - { - int steps = pageSize - 1; - unsigned int index = m_currentRow + steps; - unsigned int count = GetRowCount(); - if ( index >= count ) - index = count - 1; - - OnVerticalNavigation( index, event ); - } + OnVerticalNavigation( +(pageSize - 1), event ); break; default: @@ -3752,16 +3806,24 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } } -void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event) +void wxDataViewMainWindow::OnVerticalNavigation(int delta, const wxKeyEvent& event) { - wxCHECK_RET( newCurrent < GetRowCount(), - wxT("invalid item index in OnVerticalNavigation()") ); - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow()) + if (!HasCurrentRow() || IsEmpty()) return; + int newRow = (int)m_currentRow + delta; + + // let's keep the new row inside the allowed range + if ( newRow < 0 ) + newRow = 0; + + const int rowCount = (int)GetRowCount(); + if ( newRow >= rowCount ) + newRow = rowCount - 1; + unsigned int oldCurrent = m_currentRow; + unsigned int newCurrent = (unsigned int)newRow; // in single selection we just ignore Shift as we can't select several // items anyhow @@ -3813,6 +3875,8 @@ void wxDataViewMainWindow::OnLeftKey() else { wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + if ( !node ) + return; if ( TryAdvanceCurrentColumn(node, /*forward=*/false) ) return; @@ -3855,6 +3919,8 @@ void wxDataViewMainWindow::OnRightKey() else { wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + if ( !node ) + return; if ( node->HasChildren() ) { @@ -3939,10 +4005,11 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - if(event.LeftDown()) + if(event.ButtonDown()) { - // Not skipping this event would prevent the system from setting focus - // to this window. + // Not skipping button down events would prevent the system from + // setting focus to this window as most (all?) of them do by default, + // so skip it to enable default handling. event.Skip(); } @@ -3979,7 +4046,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (event.RightUp()) { wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); le.SetEventObject(parent); le.SetModel(model); @@ -3988,30 +4055,82 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) le.SetItem( item ); le.SetColumn( col->GetModelColumn() ); le.SetDataViewColumn( col ); - - wxVariant value; - model->GetValue( value, item, col->GetModelColumn() ); - le.SetValue(value); } parent->ProcessWindowEvent(le); return; } - if (!col) +#if wxUSE_DRAG_AND_DROP + if (event.Dragging() || ((m_dragCount > 0) && event.Leaving())) { - event.Skip(); + if (m_dragCount == 0) + { + // we have to report the raw, physical coords as we want to be + // able to call HitTest(event.m_pointDrag) from the user code to + // get the item being dragged + m_dragStart = event.GetPosition(); + } + + m_dragCount++; + if ((m_dragCount < 3) && (event.Leaving())) + m_dragCount = 3; + else if (m_dragCount != 3) + return; + + if (event.LeftIsDown()) + { + m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, + &m_dragStart.x, &m_dragStart.y ); + unsigned int drag_item_row = GetLineAt( m_dragStart.y ); + wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); + + // Notify cell about drag + wxDataViewEvent event( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( itemDragged ); + event.SetModel( model ); + if (!m_owner->HandleWindowEvent( event )) + return; + + if (!event.IsAllowed()) + return; + + wxDataObject *obj = event.GetDataObject(); + if (!obj) + return; + + wxDataViewDropSource drag( this, drag_item_row ); + drag.SetData( *obj ); + /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags()); + delete obj; + } return; } + else + { + m_dragCount = 0; + } +#endif // wxUSE_DRAG_AND_DROP - wxDataViewRenderer *cell = col->GetRenderer(); - if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) + // Check if we clicked outside the item area. + if ((current >= GetRowCount()) || !col) { - // Unselect all if below the last row ? + // Follow Windows convention here: clicking either left or right (but + // not middle) button clears the existing selection. + if (m_owner && (event.LeftDown() || event.RightDown())) + { + if (!GetSelections().empty()) + { + m_owner->UnselectAll(); + SendSelectionChangedEvent(wxDataViewItem()); + } + } event.Skip(); return; } + wxDataViewRenderer *cell = col->GetRenderer(); wxDataViewColumn* const expander = GetExpanderColumnOrFirstOne(GetOwner()); @@ -4067,57 +4186,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } } -#if wxUSE_DRAG_AND_DROP - if (event.Dragging()) - { - if (m_dragCount == 0) - { - // we have to report the raw, physical coords as we want to be - // able to call HitTest(event.m_pointDrag) from the user code to - // get the item being dragged - m_dragStart = event.GetPosition(); - } - - m_dragCount++; - - if (m_dragCount != 3) - return; - - if (event.LeftIsDown()) - { - m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, - &m_dragStart.x, &m_dragStart.y ); - unsigned int drag_item_row = GetLineAt( m_dragStart.y ); - wxDataViewItem itemDragged = GetItemByRow( drag_item_row ); - - // Notify cell about drag - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); - event.SetEventObject( m_owner ); - event.SetItem( itemDragged ); - event.SetModel( model ); - if (!m_owner->HandleWindowEvent( event )) - return; - - if (!event.IsAllowed()) - return; - - wxDataObject *obj = event.GetDataObject(); - if (!obj) - return; - - wxDataViewDropSource drag( this, drag_item_row ); - drag.SetData( *obj ); - /* wxDragResult res = */ drag.DoDragDrop(event.GetDragFlags()); - delete obj; - } - return; - } - else - { - m_dragCount = 0; - } -#endif // wxUSE_DRAG_AND_DROP - bool simulateClick = false; if (event.ButtonDClick()) @@ -4141,7 +4209,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) else if ( current == m_lineLastClicked ) { wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); le.SetItem( item ); le.SetColumn( col->GetModelColumn() ); le.SetDataViewColumn( col ); @@ -4289,8 +4357,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_currentCol = col; m_currentColSetByKeyboard = false; + // This flag is used to decide whether we should start editing the item + // label. We do it if the user clicks twice (but not double clicks, + // i.e. simulateClick is false) on the same item but not if the click + // was used for something else already, e.g. selecting the item (so it + // must have been already selected) or giving the focus to the control + // (so it must have had focus already). m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && - (current == oldCurrentRow)) && oldWasSelected; + (current == oldCurrentRow)) && oldWasSelected && + HasFocus(); // Call ActivateCell() after everything else as under GTK+ if ( IsCellEditableInMode(item, col, wxDATAVIEW_CELL_ACTIVATABLE) ) @@ -4304,33 +4379,38 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) GetLineHeight( current ) ); // Report position relative to the cell's custom area, i.e. - // no the entire space as given by the control but the one + // not the entire space as given by the control but the one // used by the renderer after calculation of alignment etc. + // + // Notice that this results in negative coordinates when clicking + // in the upper left corner of a centre-aligned cell which doesn't + // fill its column entirely so this is somewhat surprising, but we + // do it like this for compatibility with the native GTK+ version, + // see #12270. // adjust the rectangle ourselves to account for the alignment + int align = cell->GetAlignment(); + if ( align == wxDVR_DEFAULT_ALIGNMENT ) + align = wxALIGN_CENTRE; + wxRect rectItem = cell_rect; - const int align = cell->GetAlignment(); - if ( align != wxDVR_DEFAULT_ALIGNMENT ) + const wxSize size = cell->GetSize(); + if ( size.x >= 0 && size.x < cell_rect.width ) { - const wxSize size = cell->GetSize(); - - if ( size.x >= 0 && size.x < cell_rect.width ) - { - if ( align & wxALIGN_CENTER_HORIZONTAL ) - rectItem.x += (cell_rect.width - size.x)/2; - else if ( align & wxALIGN_RIGHT ) - rectItem.x += cell_rect.width - size.x; - // else: wxALIGN_LEFT is the default - } + if ( align & wxALIGN_CENTER_HORIZONTAL ) + rectItem.x += (cell_rect.width - size.x)/2; + else if ( align & wxALIGN_RIGHT ) + rectItem.x += cell_rect.width - size.x; + // else: wxALIGN_LEFT is the default + } - if ( size.y >= 0 && size.y < cell_rect.height ) - { - if ( align & wxALIGN_CENTER_VERTICAL ) - rectItem.y += (cell_rect.height - size.y)/2; - else if ( align & wxALIGN_BOTTOM ) - rectItem.y += cell_rect.height - size.y; - // else: wxALIGN_TOP is the default - } + if ( size.y >= 0 && size.y < cell_rect.height ) + { + if ( align & wxALIGN_CENTER_VERTICAL ) + rectItem.y += (cell_rect.height - size.y)/2; + else if ( align & wxALIGN_BOTTOM ) + rectItem.y += cell_rect.height - size.y; + // else: wxALIGN_TOP is the default } wxMouseEvent event2(event); @@ -4418,6 +4498,7 @@ void wxDataViewCtrl::Init() m_sortingColumnIdx = wxNOT_FOUND; m_headerArea = NULL; + m_clientArea = NULL; m_colsDirty = false; } @@ -4531,6 +4612,31 @@ void wxDataViewCtrl::SetFocus() m_clientArea->SetFocus(); } +bool wxDataViewCtrl::SetFont(const wxFont & font) +{ + if (!wxControl::SetFont(font)) + return false; + + if (m_headerArea) + m_headerArea->SetFont(font); + + if (m_clientArea) + { + m_clientArea->SetFont(font); + m_clientArea->SetRowHeight(m_clientArea->GetDefaultRowHeight()); + } + + if (m_headerArea || m_clientArea) + { + InvalidateColBestWidths(); + Layout(); + } + + return true; +} + + + bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model ))