cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Bo for new selection API and impl. of GetColumnPos

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2007-09-20 19:38:57 +00:00
parent 03cf4aa61d
commit 526e19e2d3
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/generic/datavgen.cpp
View File

@ -489,6 +489,7 @@ public:
void SelectRows( unsigned int from, unsigned int to, bool on ); void SelectRows( unsigned int from, unsigned int to, bool on );
void ReverseRowSelection( unsigned int row ); void ReverseRowSelection( unsigned int row );
bool IsRowSelected( unsigned int row ); bool IsRowSelected( unsigned int row );
void SendSelectionChangedEvent( const wxDataViewItem& item);
void RefreshRow( unsigned int row ); void RefreshRow( unsigned int row );
void RefreshRows( unsigned int from, unsigned int to ); void RefreshRows( unsigned int from, unsigned int to );
@ -2660,6 +2661,18 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
return (m_selection.Index( row ) != wxNOT_FOUND); return (m_selection.Index( row ) != wxNOT_FOUND);
} }
void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item)
{
wxWindow *parent = GetParent();
wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId());
le.SetEventObject(parent);
le.SetModel(GetOwner()->GetModel());
le.SetItem( item );
parent->GetEventHandler()->ProcessEvent(le);
}
void wxDataViewMainWindow::RefreshRow( unsigned int row ) void wxDataViewMainWindow::RefreshRow( unsigned int row )
{ {
wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight ); wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
@ -2734,6 +2747,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
} }
SelectRows( oldCurrent, newCurrent, true ); SelectRows( oldCurrent, newCurrent, true );
if (oldCurrent!=newCurrent)
SendSelectionChangedEvent(GetItemByRow(m_selection[0]));
} }
else // !shift else // !shift
{ {
@ -2746,7 +2761,10 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent
ChangeCurrentRow( newCurrent ); ChangeCurrentRow( newCurrent );
if ( !event.ControlDown() ) if ( !event.ControlDown() )
{
SelectRow( m_currentRow, true ); SelectRow( m_currentRow, true );
SendSelectionChangedEvent(GetItemByRow(m_currentRow));
}
else else
RefreshRow( m_currentRow ); RefreshRow( m_currentRow );
} }
@ -2942,6 +2960,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row )
SelectRow( row, false ); SelectRow( row, false );
SelectRow( row + 1, true ); SelectRow( row + 1, true );
ChangeCurrentRow( row + 1 ); ChangeCurrentRow( row + 1 );
SendSelectionChangedEvent( GetItemByRow(row+1));
} }
} }
else else
@ -2977,6 +2996,7 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row)
SelectRow( row, false); SelectRow( row, false);
SelectRow(parent , true ); SelectRow(parent , true );
ChangeCurrentRow( parent ); ChangeCurrentRow( parent );
SendSelectionChangedEvent( node->GetItem() );
} }
} }
} }
@ -3372,7 +3392,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
{ {
if (m_underMouse != NULL) if (m_underMouse != NULL)
{ {
wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
Refresh(GetRowByItem(m_underMouse->GetItem())); Refresh(GetRowByItem(m_underMouse->GetItem()));
m_underMouse = NULL; m_underMouse = NULL;
} }
@ -3511,6 +3531,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
SelectAllRows(false); SelectAllRows(false);
ChangeCurrentRow(current); ChangeCurrentRow(current);
SelectRow(m_currentRow,true); SelectRow(m_currentRow,true);
SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
} }
// notify cell about right click // notify cell about right click
@ -3540,10 +3561,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
if ( IsSingleSel() || !IsRowSelected(current) ) if ( IsSingleSel() || !IsRowSelected(current) )
{ {
SelectAllRows( false ); SelectAllRows( false );
ChangeCurrentRow(current); ChangeCurrentRow(current);
SelectRow(m_currentRow,true); SelectRow(m_currentRow,true);
SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
} }
else // multi sel & current is highlighted & no mod keys else // multi sel & current is highlighted & no mod keys
{ {
@ -3556,8 +3576,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
if (cmdModifierDown) if (cmdModifierDown)
{ {
ChangeCurrentRow(current); ChangeCurrentRow(current);
ReverseRowSelection(m_currentRow); ReverseRowSelection(m_currentRow);
SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
} }
else if (event.ShiftDown()) else if (event.ShiftDown())
{ {
@ -3573,6 +3593,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
} }
SelectRows(lineFrom, lineTo, true); SelectRows(lineFrom, lineTo, true);
SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
} }
else // !ctrl, !shift else // !ctrl, !shift
{ {
@ -3796,7 +3817,21 @@ bool wxDataViewCtrl::ClearColumns()
int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
{ {
return -1; int ret = 0, dead = 0;
int len = GetColumnCount();
for (int i=0; i<len; i++)
{
wxDataViewColumn * col = GetColumn(i);
if (col->IsHidden())
continue;
ret += col->GetWidth();
if (column==col)
{
CalcScrolledPosition( ret, dead, &ret, &dead );
break;
}
}
return ret;
} }
wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const