X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5a056a84a18861acab62ea97a4b1414ce2f4a5..bddab017c6c78f1dab68745a532996bab37f3ee8:/src/generic/datavgen.cpp?ds=inline diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index def4fb5877..d5c0614e60 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 ///////////////////////////////////////////////////////////////////////////// @@ -161,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 ) @@ -239,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 @@ -269,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(); } @@ -613,26 +622,33 @@ public: { g_model = GetModel(); - // 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; - } - wxDataViewColumn* col = GetOwner()->GetSortingColumn(); if( !col ) { if (g_model->HasDefaultCompare()) - g_column = SortColumn_Default; + { + // See below for the explanation of IsFrozen() test. + if ( IsFrozen() ) + g_column = SortColumn_OnThaw; + else + g_column = SortColumn_Default; + } else 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(); } @@ -1005,7 +1021,7 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { if (m_bitmap.IsOk()) - dc->DrawBitmap( m_bitmap, cell.x, cell.y ); + dc->DrawBitmap( m_bitmap, cell.x, cell.y, true /* use mask */ ); else if (m_icon.IsOk()) dc->DrawIcon( m_icon, cell.x, cell.y ); @@ -1073,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, @@ -1081,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; } @@ -1542,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 ); @@ -1586,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 ); @@ -1617,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 ); @@ -1776,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); @@ -2461,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); @@ -2502,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); @@ -2781,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()); @@ -3132,7 +3149,7 @@ void wxDataViewMainWindow::Expand( unsigned int row ) if (!node->IsOpen()) { - if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) + if ( !SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) { // Vetoed by the event handler. return; @@ -3166,7 +3183,7 @@ void wxDataViewMainWindow::Expand( unsigned int row ) m_count = -1; UpdateDisplay(); // Send the expanded event - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + SendExpanderEvent(wxEVT_DATAVIEW_ITEM_EXPANDED,node->GetItem()); } } @@ -3184,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; @@ -3240,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()); } } @@ -3667,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); @@ -4029,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); @@ -4044,6 +4061,58 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } +#if wxUSE_DRAG_AND_DROP + if (event.Dragging() || ((m_dragCount > 0) && event.Leaving())) + { + 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 + // Check if we clicked outside the item area. if ((current >= GetRowCount()) || !col) { @@ -4117,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()) @@ -4191,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 ); @@ -4361,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);