// 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
/////////////////////////////////////////////////////////////////////////////
// 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;
// ----------------------------------------------------------------------------
}
}
+void wxDataViewColumn::UnsetAsSortKey()
+{
+ m_sort = false;
+
+ if ( m_owner )
+ m_owner->SetSortingColumnIndex(wxNOT_FOUND);
+
+ UpdateDisplay();
+}
+
void wxDataViewColumn::SetSortOrder(bool ascending)
{
if ( !m_owner )
{
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
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();
}
static wxDataViewTreeNode* CreateRootNode()
{
wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());
- n->SetHasChildren(true);
+ n->m_branchData = new BranchNodeData;
n->m_branchData->open = true;
return n;
}
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;
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);
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();
}
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 );
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;
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 );
return true;
}
-bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell),
+bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect),
wxDataViewModel *model,
const wxDataViewItem& item,
unsigned int col,
{
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;
}
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;
}
+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 )
{
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 );
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 );
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 );
wxDataViewModel *model = GetModel();
wxAutoBufferedPaintDC dc( this );
-#ifdef __WXMSW__
dc.SetBrush(GetOwner()->GetBackgroundColour());
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle(GetClientSize());
-#endif
if ( IsEmpty() )
{
// 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);
// If this was the last child to be removed, it's possible the parent
// node became a leaf. Let's ask the model about it.
if ( parentNode->GetChildNodes().empty() )
- parentNode->SetHasChildren(GetModel()->IsContainer(parent));
+ {
+ bool isContainer = GetModel()->IsContainer(parent);
+ parentNode->SetHasChildren(isContainer);
+ if ( isContainer )
+ {
+ // If it's still a container, make sure we show "+" icon for it
+ // and not "-" one as there is nothing to collapse any more.
+ if ( parentNode->IsOpen() )
+ parentNode->ToggleOpen();
+ }
+ }
// Update selection by removing 'item' and its entire children tree from the selection.
if ( !m_selection.empty() )
}
// 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();
// 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);
bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )
{
- int view_column = -1;
- unsigned int n_col = m_owner->GetColumnCount();
- for (unsigned i = 0; i < n_col; i++)
- {
- wxDataViewColumn *column = m_owner->GetColumn( i );
- if (column->GetModelColumn() == model_column)
- {
- view_column = (int) i;
- break;
- }
- }
- if (view_column == -1)
+ int view_column = m_owner->GetModelColumnIndex(model_column);
+ if ( view_column == wxNOT_FOUND )
return false;
// NOTE: to be valid, we cannot use e.g. INT_MAX - 1
// 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);
{
DestroyTree();
m_selection.Clear();
+ m_currentRow = (unsigned)-1;
- SortPrepare();
- BuildTree( GetModel() );
+ if (GetModel())
+ {
+ SortPrepare();
+ BuildTree( GetModel() );
+ }
+ else
+ {
+ m_count = 0;
+ }
GetOwner()->InvalidateColBestWidths();
UpdateDisplay();
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());
{
wxASSERT( !IsVirtualList() );
+ if ( row == (unsigned)-1 )
+ return NULL;
+
RowToTreeNodeJob job( row , -2, m_root );
Walker( m_root , job );
return job.GetResult();
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; i<m_selection.size(); ++i)
- {
- const unsigned testRow = m_selection[i];
- // all rows above us are not affected, so skip them
- if(testRow <= row)
- continue;
+ // 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; i<m_selection.size(); ++i)
+ {
+ const unsigned testRow = m_selection[i];
+ // all rows above us are not affected, so skip them
+ if(testRow <= row)
+ continue;
- m_selection[i] += rowAdjustment;
- }
+ m_selection[i] += rowAdjustment;
+ }
- if(m_currentRow > 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)
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;
m_count = -1;
UpdateDisplay();
- SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
+ SendExpanderEvent(wxEVT_DATAVIEW_ITEM_COLLAPSED,node->GetItem());
}
}
}
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);
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:
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:
}
}
-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
else
{
wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+ if ( !node )
+ return;
if ( TryAdvanceCurrentColumn(node, /*forward=*/false) )
return;
else
{
wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+ if ( !node )
+ return;
if ( node->HasChildren() )
{
return;
}
- // set the focus to ourself if any of the mouse buttons are pressed
- if(event.ButtonDown() && !HasFocus())
- SetFocus();
+ if(event.ButtonDown())
+ {
+ // 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();
+ }
int x = event.GetX();
int y = event.GetY();
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);
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());
}
}
-#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())
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 );
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) )
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);
m_sortingColumnIdx = wxNOT_FOUND;
m_headerArea = NULL;
+ m_clientArea = NULL;
m_colsDirty = false;
}
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 ))
return false;
- m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
-
- model->AddNotifier( m_notifier );
+ if (model)
+ {
+ m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
+ model->AddNotifier( m_notifier );
+ }
+ else if (m_notifier)
+ {
+ m_notifier->Cleared();
+ m_notifier = NULL;
+ }
m_clientArea->DestroyTree();
- m_clientArea->BuildTree(model);
+ if (model)
+ {
+ m_clientArea->BuildTree(model);
+ }
m_clientArea->UpdateDisplay();
void wxDataViewCtrl::DoSetExpanderColumn()
{
+ wxDataViewColumn* column = GetExpanderColumn();
+ if ( column )
+ {
+ int index = GetColumnIndex(column);
+ if ( index != wxNOT_FOUND )
+ InvalidateColBestWidth(index);
+ }
+
m_clientArea->UpdateDisplay();
}
return wxNOT_FOUND;
}
+int wxDataViewCtrl::GetModelColumnIndex( unsigned int model_column ) const
+{
+ const int count = GetColumnCount();
+ for ( int index = 0; index < count; index++ )
+ {
+ wxDataViewColumn* column = GetColumn(index);
+ if ( column->GetModelColumn() == model_column )
+ return index;
+ }
+ return wxNOT_FOUND;
+}
+
unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
{
if ( m_colsBestWidths[idx].width != 0 )
wxDataViewMainWindow *clientArea,
wxDataViewRenderer *renderer,
const wxDataViewModel *model,
- unsigned column,
+ unsigned int model_column,
int expanderSize)
: m_width(0),
m_dvc(dvc),
m_clientArea(clientArea),
m_renderer(renderer),
m_model(model),
- m_column(column),
+ m_model_column(model_column),
m_expanderSize(expanderSize)
{
+ int index = dvc->GetModelColumnIndex( model_column );
+ wxDataViewColumn* column = index == wxNOT_FOUND ? NULL : dvc->GetColumn(index);
m_isExpanderCol =
!clientArea->IsList() &&
(column == 0 ||
- GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == dvc->GetColumnAt(column));
+ GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == column );
}
void UpdateWithWidth(int width)
item = m_clientArea->GetItemByRow(row);
}
- m_renderer->PrepareForItem(m_model, item, m_column);
+ m_renderer->PrepareForItem(m_model, item, m_model_column);
m_width = wxMax(m_width, m_renderer->GetSize().x + indent);
}
wxDataViewMainWindow *m_clientArea;
wxDataViewRenderer *m_renderer;
const wxDataViewModel *m_model;
- unsigned m_column;
+ unsigned m_model_column;
bool m_isExpanderCol;
int m_expanderSize;
};
projects / wxWidgets.git / blobdiff