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);
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;
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 )
{
}
// 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();
{
DestroyTree();
m_selection.Clear();
+ m_currentRow = (unsigned)-1;
if (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_COMMAND_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_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem());
+ }
}
void wxDataViewMainWindow::Collapse(unsigned int row)
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;
}
- 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();
}
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)
+ // Check if we clicked outside the item area.
+ if ((current >= GetRowCount()) || !col)
{
+ // 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();
- if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
- {
- // Unselect all if below the last row ?
- event.Skip();
- return;
- }
-
wxDataViewColumn* const
expander = GetExpanderColumnOrFirstOne(GetOwner());
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 ))
projects / wxWidgets.git / blobdiff