static int g_column = -2;
static bool g_asending = true;
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+// Return the expander column or, if it is not set, the first column and also
+// set it as the expander one for the future.
+wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview)
+{
+ wxDataViewColumn* expander = dataview->GetExpanderColumn();
+ if (!expander)
+ {
+ // TODO-RTL: last column for RTL support
+ expander = dataview->GetColumnAt( 0 );
+ dataview->SetExpanderColumn(expander);
+ }
+
+ return expander;
+}
+
+} // anonymous namespace
+
//-----------------------------------------------------------------------------
// wxDataViewColumn
//-----------------------------------------------------------------------------
// for events created by wxDataViewHeaderWindow the
// row / value fields are not valid
- return owner->GetEventHandler()->ProcessEvent(event);
+ return owner->ProcessWindowEvent(event);
}
void OnClick(wxHeaderCtrlEvent& event)
wxBitmap CreateItemBitmap( unsigned int row, int &indent );
#endif // wxUSE_DRAG_AND_DROP
void OnPaint( wxPaintEvent &event );
- void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event);
void OnChar( wxKeyEvent &event );
+ void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event);
+ void OnLeftKey();
+ void OnRightKey();
void OnMouse( wxMouseEvent &event );
void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event );
wxDataViewModel *model = m_owner->GetModel();
- wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
- if (!expander)
- {
- // TODO-RTL: last column for RTL support
- expander = GetOwner()->GetColumnAt( 0 );
- GetOwner()->SetExpanderColumn(expander);
- }
-
+ wxDataViewColumn * const
+ expander = GetExpanderColumnOrFirstOne(GetOwner());
int x = 0;
for (col = 0; col < cols; col++)
}
#endif // wxUSE_DRAG_AND_DROP
- wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
- if (!expander)
- {
- // TODO-RTL: last column for RTL support
- expander = GetOwner()->GetColumnAt( 0 );
- GetOwner()->SetExpanderColumn(expander);
- }
+ wxDataViewColumn * const
+ expander = GetExpanderColumnOrFirstOne(GetOwner());
// redraw all cells for all rows which must be repainted and all columns
wxRect cell_rect;
// Skip all columns of "container" rows except the expander
// column itself unless HasContainerColumns() overrides this.
- if ( col != GetOwner()->GetExpanderColumn() &&
+ if ( col != expander &&
model->IsContainer(dataitem) &&
!model->HasContainerColumns(dataitem) )
continue;
le.SetEventObject(parent);
le.SetModel(GetModel());
le.SetItem(item);
- parent->GetEventHandler()->ProcessEvent(le);
+ parent->ProcessWindowEvent(le);
return true;
}
le.SetItem(item);
le.SetColumn(view_column);
le.SetDataViewColumn(GetOwner()->GetColumn(view_column));
- parent->GetEventHandler()->ProcessEvent(le);
+ parent->ProcessWindowEvent(le);
return true;
}
le.SetModel(GetModel());
le.SetItem( item );
- parent->GetEventHandler()->ProcessEvent(le);
+ parent->ProcessWindowEvent(le);
}
void wxDataViewMainWindow::RefreshRow( unsigned int row )
Refresh( true, &rect );
}
-void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
-{
- wxCHECK_RET( newCurrent < GetRowCount(),
- wxT("invalid item index in OnArrowChar()") );
-
- // if there is no selection, we cannot move it anywhere
- if (!HasCurrentRow())
- return;
-
- unsigned int oldCurrent = m_currentRow;
-
- // in single selection we just ignore Shift as we can't select several
- // items anyhow
- if ( event.ShiftDown() && !IsSingleSel() )
- {
- RefreshRow( oldCurrent );
-
- ChangeCurrentRow( newCurrent );
-
- // select all the items between the old and the new one
- if ( oldCurrent > newCurrent )
- {
- newCurrent = oldCurrent;
- oldCurrent = m_currentRow;
- }
-
- SelectRows( oldCurrent, newCurrent, true );
- if (oldCurrent!=newCurrent)
- SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
- }
- else // !shift
- {
- RefreshRow( oldCurrent );
-
- // all previously selected items are unselected unless ctrl is held
- if ( !event.ControlDown() )
- SelectAllRows(false);
-
- ChangeCurrentRow( newCurrent );
-
- if ( !event.ControlDown() )
- {
- SelectRow( m_currentRow, true );
- SendSelectionChangedEvent(GetItemByRow(m_currentRow));
- }
- else
- RefreshRow( m_currentRow );
- }
-
- GetOwner()->EnsureVisible( m_currentRow, -1 );
-}
-
wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const
{
wxRect rect;
// to get the correct x position where the actual text is
int indent = 0;
int row = GetRowByItem(item);
- if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
+ if (!IsList() &&
+ (column == 0 || GetExpanderColumnOrFirstOne(GetOwner()) == column) )
{
wxDataViewTreeNode* node = GetTreeNodeByRow(row);
indent = GetOwner()->GetIndent() * node->GetIndentLevel();
switch ( event.GetKeyCode() )
{
case WXK_RETURN:
- case WXK_SPACE:
{
+ // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to
+ // it. Only if that event is not handled do we activate column renderer (which
+ // is normally done by Space).
+
const wxDataViewItem item = GetItemByRow(m_currentRow);
+ wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
+ parent->GetId());
+ le.SetItem(item);
+ le.SetEventObject(parent);
+ le.SetModel(GetModel());
+
+ if ( parent->ProcessWindowEvent(le) )
+ break;
+ // else: fall through to WXK_SPACE handling
+ }
+
+ case WXK_SPACE:
+ {
// Activate the first activatable column if there is any:
wxDataViewColumn *activatableCol = NULL;
}
}
- bool activated = false;
-
if ( activatableCol )
{
+ const wxDataViewItem item = GetItemByRow(m_currentRow);
+
const unsigned colIdx = activatableCol->GetModelColumn();
const wxRect cell_rect = GetOwner()->GetItemRect(item, activatableCol);
wxDataViewRenderer *cell = activatableCol->GetRenderer();
cell->PrepareForItem(GetModel(), item, colIdx);
- activated = cell->WXOnActivate(cell_rect, GetModel(), item, colIdx);
- }
-
- if ( !activated )
- {
- wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
- parent->GetId());
- le.SetItem(item);
- le.SetEventObject(parent);
- le.SetModel(GetModel());
-
- parent->GetEventHandler()->ProcessEvent(le);
+ cell->WXOnActivate(cell_rect, GetModel(), item, colIdx);
}
}
break;
case WXK_UP:
if ( m_currentRow > 0 )
- OnArrowChar( m_currentRow - 1, event );
+ OnVerticalNavigation( m_currentRow - 1, event );
break;
case WXK_DOWN:
if ( m_currentRow + 1 < GetRowCount() )
- OnArrowChar( m_currentRow + 1, event );
+ OnVerticalNavigation( m_currentRow + 1, event );
break;
// Add the process for tree expanding/collapsing
case WXK_LEFT:
- {
- if (IsList())
- break;
-
- wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
- if (!node)
- break;
-
- if (node->HasChildren() && node->IsOpen())
- {
- Collapse(m_currentRow);
- }
- else // if the node is already closed we move the selection to its parent
- {
- wxDataViewTreeNode *parent_node = node->GetParent();
-
- if (parent_node)
- {
- int parent = GetRowByItem( parent_node->GetItem() );
- if ( parent >= 0 )
- {
- unsigned int row = m_currentRow;
- SelectRow( row, false);
- SelectRow( parent, true );
- ChangeCurrentRow( parent );
- GetOwner()->EnsureVisible( parent, -1 );
- SendSelectionChangedEvent( parent_node->GetItem() );
- }
- }
- }
+ OnLeftKey();
break;
- }
+
case WXK_RIGHT:
- {
- if (!IsExpanded( m_currentRow ))
- Expand( m_currentRow );
- else
- {
- unsigned int row = m_currentRow;
- SelectRow( row, false );
- SelectRow( row + 1, true );
- ChangeCurrentRow( row + 1 );
- GetOwner()->EnsureVisible( row + 1, -1 );
- SendSelectionChangedEvent( GetItemByRow(row+1) );
- }
+ OnRightKey();
break;
- }
+
case WXK_END:
{
if (!IsEmpty())
- OnArrowChar( GetRowCount() - 1, event );
+ OnVerticalNavigation( GetRowCount() - 1, event );
break;
}
case WXK_HOME:
if (!IsEmpty())
- OnArrowChar( 0, event );
+ OnVerticalNavigation( 0, event );
break;
case WXK_PAGEUP:
if (index < 0)
index = 0;
- OnArrowChar( index, event );
+ OnVerticalNavigation( index, event );
}
break;
if ( index >= count )
index = count - 1;
- OnArrowChar( index, event );
+ OnVerticalNavigation( index, event );
}
break;
case WXK_F2:
{
- if(m_selection.size() == 1)
+ if( !m_selection.empty() )
{
// TODO: we need to revise that when we have a concept for a 'current column'
GetOwner()->StartEditor(GetItemByRow(m_selection[0]), 0);
}
}
+void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, 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())
+ return;
+
+ unsigned int oldCurrent = m_currentRow;
+
+ // in single selection we just ignore Shift as we can't select several
+ // items anyhow
+ if ( event.ShiftDown() && !IsSingleSel() )
+ {
+ RefreshRow( oldCurrent );
+
+ ChangeCurrentRow( newCurrent );
+
+ // select all the items between the old and the new one
+ if ( oldCurrent > newCurrent )
+ {
+ newCurrent = oldCurrent;
+ oldCurrent = m_currentRow;
+ }
+
+ SelectRows( oldCurrent, newCurrent, true );
+ if (oldCurrent!=newCurrent)
+ SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
+ }
+ else // !shift
+ {
+ RefreshRow( oldCurrent );
+
+ // all previously selected items are unselected unless ctrl is held
+ if ( !event.ControlDown() )
+ SelectAllRows(false);
+
+ ChangeCurrentRow( newCurrent );
+
+ if ( !event.ControlDown() )
+ {
+ SelectRow( m_currentRow, true );
+ SendSelectionChangedEvent(GetItemByRow(m_currentRow));
+ }
+ else
+ RefreshRow( m_currentRow );
+ }
+
+ GetOwner()->EnsureVisible( m_currentRow, -1 );
+}
+
+void wxDataViewMainWindow::OnLeftKey()
+{
+ if (IsList())
+ return;
+
+ wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
+ if (!node)
+ return;
+
+ if (node->HasChildren() && node->IsOpen())
+ {
+ Collapse(m_currentRow);
+ }
+ else // if the node is already closed we move the selection to its parent
+ {
+ wxDataViewTreeNode *parent_node = node->GetParent();
+
+ if (parent_node)
+ {
+ int parent = GetRowByItem( parent_node->GetItem() );
+ if ( parent >= 0 )
+ {
+ unsigned int row = m_currentRow;
+ SelectRow( row, false);
+ SelectRow( parent, true );
+ ChangeCurrentRow( parent );
+ GetOwner()->EnsureVisible( parent, -1 );
+ SendSelectionChangedEvent( parent_node->GetItem() );
+ }
+ }
+ }
+}
+
+void wxDataViewMainWindow::OnRightKey()
+{
+ if (!IsExpanded( m_currentRow ))
+ Expand( m_currentRow );
+ else
+ {
+ unsigned int row = m_currentRow;
+ SelectRow( row, false );
+ SelectRow( row + 1, true );
+ ChangeCurrentRow( row + 1 );
+ GetOwner()->EnsureVisible( row + 1, -1 );
+ SendSelectionChangedEvent( GetItemByRow(row+1) );
+ }
+}
+
void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
{
if (event.GetEventType() == wxEVT_MOUSEWHEEL)
return;
}
+ wxDataViewColumn* const
+ expander = GetExpanderColumnOrFirstOne(GetOwner());
+
// Test whether the mouse is hovering over the expander (a.k.a tree "+"
// button) and also determine the offset of the real cell start, skipping
// the indentation and the expander itself.
bool hoverOverExpander = false;
int itemOffset = 0;
- if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col))
+ if ((!IsList()) && (expander == col))
{
wxDataViewTreeNode * node = GetTreeNodeByRow(current);
wxDataViewItem item = GetItemByRow(current);
bool ignore_other_columns =
- ((GetOwner()->GetExpanderColumn() != col) &&
+ ((expander != col) &&
(model->IsContainer(item)) &&
(!model->HasContainerColumns(item)));
le.SetEventObject(parent);
le.SetModel(GetModel());
- parent->GetEventHandler()->ProcessEvent(le);
+ parent->ProcessWindowEvent(le);
}
return;
}
le.SetEventObject(parent);
le.SetModel(GetModel());
le.SetValue(value);
- parent->GetEventHandler()->ProcessEvent(le);
+ parent->ProcessWindowEvent(le);
}
else if (event.MiddleDown())
{
bool wxDataViewCtrl::ClearColumns()
{
+ SetExpanderColumn(NULL);
m_cols.Clear();
m_colsBestWidths.clear();
OnColumnsCountChanged();
if ( !m_headerArea )
return;
- for ( wxVector<int>::const_iterator i = m_colsBestWidths.begin();
- i != m_colsBestWidths.end();
- ++i )
+ const unsigned len = m_colsBestWidths.size();
+ for ( unsigned i = 0; i < len; i++ )
{
- if ( m_colsBestWidths[*i] == 0 )
- m_headerArea->UpdateColumn(*i);
+ if ( m_colsBestWidths[i] == 0 )
+ m_headerArea->UpdateColumn(i);
}
}
if (!col)
return;
- wxRect itemRect = GetItemRect(item, col);
wxDataViewRenderer* renderer = col->GetRenderer();
- if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE)
- renderer->StartEditing(item, itemRect);
+ if (renderer->GetMode() != wxDATAVIEW_CELL_EDITABLE)
+ return;
+
+ const wxRect itemRect = GetItemRect(item, col);
+ renderer->StartEditing(item, itemRect);
}
#endif // !wxUSE_GENERICDATAVIEWCTRL
projects / wxWidgets.git / blobdiff