#define USE_NATIVE_HEADER_WINDOW 0
+//Below is the compare stuff
+//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
+static wxDataViewModel * g_model;
+static int g_column = -2;
+static bool g_asending = true;
+
// NB: for some reason, this class must be dllexport'ed or we get warnings from
// MSVC in DLL build
class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl
// wxDataViewTreeNode
//-----------------------------------------------------------------------------
class wxDataViewTreeNode;
-WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
-WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves);
+WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves);
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2);
-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2);
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2);
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2);
class wxDataViewTreeNode
{
public:
wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL )
- :leaves( wxGenericTreeModelItemCmp ),
- nodes(wxGenericTreeModelNodeCmp)
{ this->parent = parent;
if( parent == NULL )
open = true;
void AddNode( wxDataViewTreeNode * node )
{
- nodes.Add( node );
leaves.Add( node->GetItem().GetID() );
+ if (g_column >= -1)
+ leaves.Sort( &wxGenericTreeModelItemCmp );
+ nodes.Add( node );
+ if (g_column >= -1)
+ nodes.Sort( &wxGenericTreeModelNodeCmp );
+ }
+ void AddLeaf( void * leaf )
+ {
+ leaves.Add( leaf );
+ if (g_column >= -1)
+ leaves.Sort( &wxGenericTreeModelItemCmp );
}
- void AddLeaf( void * leaf ) { leaves.Add( leaf ); }
wxDataViewItem & GetItem() { return item; }
void SetItem( const wxDataViewItem & item ) { this->item = item; }
void Resort()
{
- wxDataViewTreeNodes nds = nodes;
- wxDataViewTreeLeaves lvs = leaves;
- nodes.Empty();
- leaves.Empty();
-
- int len = nds.GetCount();
- if(len > 0)
+ if (g_column >= -1)
{
- int i;
- for(i = 0; i < len; i ++)
- nodes.Add(nds[i]);
- for(i = 0; i < len; i ++)
+ nodes.Sort( &wxGenericTreeModelNodeCmp );
+ int len = nodes.GetCount();
+ for (int i = 0; i < len; i ++)
+ {
nodes[i]->Resort();
- }
-
- len = lvs.GetCount();
- if(len > 0)
- {
- for(int i = 0; i < len; i++)
- leaves.Add(lvs[i]);
+ }
+ leaves.Sort( &wxGenericTreeModelItemCmp );
}
}
int subTreeCount;
};
-//Below is the compare stuff
-//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
-static wxDataViewModel * g_model;
-static unsigned int g_column;
-static bool g_asending;
-
-int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2)
+int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2)
{
- return g_model->Compare( node1->GetItem(), node2->GetItem(), g_column, g_asending );
+ return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending );
}
-int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2)
+int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2)
{
- return g_model->Compare( id1, id2, g_column, g_asending );
+ return g_model->Compare( *id1, *id2, g_column, g_asending );
}
void SortPrepare()
{
g_model = GetOwner()->GetModel();
- g_column = GetOwner()->GetSortingColumn();
- wxDataViewColumn * col = GetOwner()->GetColumn(g_column);
+ wxDataViewColumn* col = GetOwner()->GetSortingColumn();
if( !col )
{
+ if (g_model->HasDefaultCompare())
+ g_column = -1;
+ else
+ g_column = -2;
+
g_asending = true;
return;
}
+ g_column = col->GetModelColumn();
g_asending = col->IsSortOrderAscending();
}
void OnRenameTimer();
void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
- void ScrollTo( int rows );
+ void ScrollTo( int rows, int column );
bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
void ChangeCurrentRow( unsigned int row );
unsigned int GetLastVisibleRow();
unsigned int GetRowCount() ;
- wxDataViewItem GetSelection();
+ wxDataViewItem GetSelection() const;
wxDataViewSelection GetSelections(){ return m_selection; }
void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); }
void Select( const wxArrayInt& aSelections );
wxRect GetLineRect( unsigned int row ) const;
//Some useful functions for row and item mapping
- wxDataViewItem GetItemByRow( unsigned int row );
+ wxDataViewItem GetItemByRow( unsigned int row ) const;
int GetRowByItem( const wxDataViewItem & item );
//Methods for building the mapping tree
void BuildTree( wxDataViewModel * model );
void DestroyTree();
- void HitTest( const wxPoint & point, wxDataViewItem & item, unsigned int & column );
- wxRect GetItemRect( const wxDataViewItem & item, unsigned int column );
+ void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column );
+ wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column );
+
+ void Expand( unsigned int row ) { OnExpanding( row ); }
+ void Collapse( unsigned int row ) { OnCollapsing( row ); }
private:
wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row );
//We did not need this temporarily
//This is the tree structure of the model
wxDataViewTreeNode * m_root;
int m_count;
+ //This is the tree node under the cursor
+ wxDataViewTreeNode * m_underMouse;
private:
DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
DECLARE_EVENT_TABLE()
return true;
}
+// ---------------------------------------------------------
+// wxDataViewIconTextRenderer
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+ const wxString &varianttype, wxDataViewCellMode mode, int align ) :
+ wxDataViewCustomRenderer( varianttype, mode, align )
+{
+ SetMode(mode);
+ SetAlignment(align);
+}
+
+wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
+{
+}
+
+bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
+{
+ m_value << value;
+ return true;
+}
+
+bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
+{
+ return false;
+}
+
+bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
+{
+ dc->SetFont( GetOwner()->GetOwner()->GetFont() );
+
+ const wxIcon &icon = m_value.GetIcon();
+ if (icon.IsOk())
+ {
+ dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre
+ cell.x += icon.GetWidth()+4;
+ }
+
+ dc->DrawText( m_value.GetText(), cell.x, cell.y );
+
+ return true;
+}
+
+wxSize wxDataViewIconTextRenderer::GetSize() const
+{
+ return wxSize(80,16); // TODO
+}
+
+wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+ return NULL;
+}
+
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+ return false;
+}
+
// ---------------------------------------------------------
// wxDataViewColumn
// ---------------------------------------------------------
//hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
//sorting support
- if(model && m_owner->GetSortingColumn() == i)
+ if(model && m_owner->GetSortingColumn() == col)
{
//The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default
//see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail
wxDataViewColumn *col = GetColumn(idx);
if(col->IsSortable())
{
- if(model && m_owner->GetSortingColumn() == idx)
+ if(model && m_owner->GetSortingColumn() == col)
{
bool order = col->IsSortOrderAscending();
col->SetSortOrder(!order);
}
else if(model)
{
- m_owner->SetSortingColumn(idx);
+ m_owner->SetSortingColumn(col);
}
}
UpdateDisplay();
int ch = h;
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE;
- if (col->IsSortable() && GetOwner()->GetSortingColumn() == i)
+ if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
{
if (col->IsSortOrderAscending())
sortArrow = wxHDR_SORT_ICON_UP;
wxDataViewColumn *col = GetColumn(m_column);
if(col->IsSortable())
{
- unsigned int colnum = m_owner->GetSortingColumn();
- if(model && static_cast<int>(colnum) == m_column)
+ wxDataViewColumn* sortCol = m_owner->GetSortingColumn();
+ if(model && sortCol == col)
{
bool order = col->IsSortOrderAscending();
col->SetSortOrder(!order);
}
else if(model)
{
- m_owner->SetSortingColumn(m_column);
+ m_owner->SetSortingColumn(col);
}
}
UpdateDisplay();
//Make m_count = -1 will cause the class recaculate the real displaying number of rows.
m_count = -1 ;
+ m_underMouse = NULL;
UpdateDisplay();
}
wxDataViewItem item = GetItemByRow( m_currentRow );
m_currentCol->GetRenderer()->StartEditing( item, labelRect );
+
}
//------------------------------------------------------------------
bool Walker( wxDataViewTreeNode * node, DoJob & func )
{
- if( node==NULL || !node->HasChildren())
+ if( node==NULL )
return false;
switch( func( node ) )
m_count = -1;
UpdateDisplay();
-
+
return true;
}
bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
const wxDataViewItem& item)
{
- SortPrepare();
-
- wxDataViewTreeNode * node;
- node = FindNode(parent);
- SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item);
-
- if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND )
- {
- return false;
- }
+ wxDataViewTreeNode * node = FindNode(parent);
+
+ wxCHECK_MSG( node != NULL, false, "item not found" );
+ wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
int sub = -1;
node->GetChildren().Remove( item.GetID() );
- if( GetOwner()->GetModel()->IsContainer( item ) )
+ //Manuplate selection
+ if( m_selection.GetCount() > 1 )
+ {
+ m_selection.Empty();
+ }
+ bool isContainer = false;
+ wxDataViewTreeNodes nds = node->GetNodes();
+ for (int i = 0; i < nds.GetCount(); i ++)
+ {
+ if (nds[i]->GetItem() == item)
+ {
+ isContainer = true;
+ break;
+ }
+ }
+ if( isContainer )
{
wxDataViewTreeNode * n = NULL;
wxDataViewTreeNodes nodes = node->GetNodes();
}
}
- if (!n)
- return false;
+ wxCHECK_MSG( n != NULL, false, "item not found" );
node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount();
DestroyTreeHelper(n);
}
-
- if( node->GetChildrenNumber() == 0)
- node->SetHasChildren( false );
-
//Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1;
node->ChangeSubTreeCount(sub);
+ if( node->GetChildrenNumber() == 0)
+ {
+ node->GetParent()->GetNodes().Remove( node );
+ delete node;
+ }
+
//Change the current row to the last row if the current exceed the max row number
if( m_currentRow > GetRowCount() )
m_currentRow = m_count - 1;
UpdateDisplay();
+
+ SendModelEvent(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item);
+
return true;
}
GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
}
-void wxDataViewMainWindow::ScrollTo( int rows )
+void wxDataViewMainWindow::ScrollTo( int rows, int column )
{
int x, y;
m_owner->GetScrollPixelsPerUnit( &x, &y );
- int sc = rows*m_lineHeight/y;
- m_owner->Scroll(0, sc );
+ int sy = rows*m_lineHeight/y;
+ int sx = 0;
+ if( column != -1 )
+ {
+ wxRect rect = GetClientRect();
+ unsigned int colnum = 0;
+ unsigned int x_start = 0, x_end = 0, w = 0;
+ int xx, yy, xe;
+ m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy );
+ for (x_start = 0; colnum < column; colnum++)
+ {
+ wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+ if (col->IsHidden())
+ continue; // skip it!
+
+ w = col->GetWidth();
+ x_start += w;
+ }
+
+ x_end = x_start + w;
+ xe = xx + rect.width;
+ if( x_end > xe )
+ {
+ sx = ( xx + x_end - xe )/x;
+ }
+ if( x_start < xx )
+ {
+ sx = x_start/x;
+ }
+ }
+ m_owner->Scroll( sx, sy );
}
void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
}
}
+ wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+ if (!expander)
+ {
+ // TODO: last column for RTL support
+ expander = GetOwner()->GetColumn( 0 );
+ GetOwner()->SetExpanderColumn(expander);
+ }
+
// redraw all cells for all rows which must be repainted and for all columns
wxRect cell_rect;
cell_rect.x = x_start;
if (col->IsHidden())
continue; // skipt it!
+
for (unsigned int item = item_start; item < item_last; item++)
{
// get the cell value and set it into the renderer
}
wxDataViewItem dataitem = node->GetItem();
- model->GetValue( value, dataitem, col->GetModelColumn());
+ model->GetValue( value, dataitem, col->GetModelColumn());
cell->SetValue( value );
// update the y offset
//Draw the expander here.
int indent = node->GetIndentLevel();
- if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() )
+ if( col == expander )
{
//Calculate the indent first
indent = cell_rect.x + GetOwner()->GetIndent() * indent;
dc.SetBrush( wxNullBrush );
if( node->HasChildren() )
{
- //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0);
- //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 );
wxRect rect( expander_x , expander_y, expander_width, expander_width);
+ int flag = 0;
+ if (m_underMouse == node)
+ {
+ flag |= wxCONTROL_CURRENT;
+ }
if( node->IsOpen() )
- wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED );
+ wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
else
- wxRendererNative::Get().DrawTreeItemButton( this, dc, rect );
+ wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
}
else
{
m_owner->CalcUnscrolledPosition( client_size.x, client_size.y,
&client_size.x, &client_size.y );
- return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
+ //we should deal with the pixel here
+ unsigned int row = (client_size.y)/m_lineHeight;
+ if( client_size.y % m_lineHeight < m_lineHeight/2 )
+ row -= 1;
+
+ return wxMin( GetRowCount()-1, row );
}
unsigned int wxDataViewMainWindow::GetRowCount()
wxDataViewItem ret;
};
-wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row)
+wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const
{
RowToItemJob job( row, -2 );
Walker( m_root , job );
node->ToggleOpen();
//Here I build the children of current node
if( node->GetChildrenNumber() == 0 )
+ {
+ SortPrepare();
BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+ }
m_count = -1;
UpdateDisplay();
//Send the expanded event
if( node->HasChildren() )
{
if( node->GetChildrenNumber() == 0 )
+ {
+ SortPrepare();
BuildTreeHelper(model, node->GetItem(), node);
+ }
wxDataViewTreeNodes nodes = node->GetNodes();
- //The wxSortedArray search a node in binary search, so using Item() is more efficient
- wxDataViewTreeNode temp;
- temp.SetItem(*(n->GetData()));
- int index = nodes.Index( &temp );
- if( index == wxNOT_FOUND )
+ int i = 0;
+ for (; i < nodes.GetCount(); i ++)
+ {
+ if (nodes[i]->GetItem() == *(n->GetData()))
+ {
+ node = nodes[i];
+ break;
+ }
+ }
+ if (i == nodes.GetCount())
return NULL;
- node = nodes[index];
}
else
return NULL;
return node;
}
-void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, unsigned int & column )
+void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
{
+ wxDataViewColumn *col = NULL;
unsigned int cols = GetOwner()->GetColumnCount();
unsigned int colnum = 0;
unsigned int x_start = 0;
m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y );
for (x_start = 0; colnum < cols; colnum++)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(colnum);
+ col = GetOwner()->GetColumn(colnum);
if (col->IsHidden())
continue; // skip it!
x_start += w;
}
- column = colnum;
+ column = col;
item = GetItemByRow( y/m_lineHeight );
}
-wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, unsigned int column )
+wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column )
{
int row = GetRowByItem(item);
int y = row*m_lineHeight;
{
col = GetOwner()->GetColumn( i );
x += col->GetWidth();
- if( i == column - 1 )
+ if( GetOwner()->GetColumn(i+1) == column )
break;
}
int w = col->GetWidth();
{
wxDataViewModel * model = GetOwner()->GetModel();
if( model == NULL )
- return 0;
+ return -1;
if( !item.IsOk() )
return -1;
int x = event.GetX();
int y = event.GetY();
m_owner->CalcUnscrolledPosition( x, y, &x, &y );
-
wxDataViewColumn *col = NULL;
-
+
int xpos = 0;
unsigned int cols = GetOwner()->GetColumnCount();
unsigned int i;
}
if (!col)
return;
- wxDataViewRenderer *cell = col->GetRenderer();
+ wxDataViewRenderer *cell = col->GetRenderer();
unsigned int current = y / m_lineHeight;
-
if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
{
// Unselect all if below the last row ?
return;
}
+ //Test whether the mouse is hovered on the tree item button
+ bool hover = false;
+ if (GetOwner()->GetExpanderColumn() == col)
+ {
+ wxDataViewTreeNode * node = GetTreeNodeByRow(current);
+ if( node!=NULL && node->HasChildren() )
+ {
+ int indent = node->GetIndentLevel();
+ indent = GetOwner()->GetIndent()*indent;
+ wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN);
+ if( rect.Contains( x, y) )
+ {
+ //So the mouse is over the expander
+ hover = true;
+ if (m_underMouse && m_underMouse != node)
+ {
+ //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+ Refresh(GetRowByItem(m_underMouse->GetItem()));
+ }
+ if (m_underMouse != node)
+ {
+ //wxLogMessage("Do the row: %d", current);
+ Refresh(current);
+ }
+ m_underMouse = node;
+ }
+ }
+ if (node!=NULL && !node->HasChildren())
+ delete node;
+ }
+ if (!hover)
+ {
+ if (m_underMouse != NULL)
+ {
+ wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem()));
+ Refresh(GetRowByItem(m_underMouse->GetItem()));
+ m_underMouse = NULL;
+ }
+ }
+
wxDataViewModel *model = GetOwner()->GetModel();
if (event.Dragging())
}
if (event.LeftDown() || forceClick)
{
-#ifdef __WXMSW__
SetFocus();
-#endif
m_lineBeforeLastClicked = m_lineLastClicked;
m_lineLastClicked = current;
event.Skip();
}
-wxDataViewItem wxDataViewMainWindow::GetSelection()
+wxDataViewItem wxDataViewMainWindow::GetSelection() const
{
if( m_selection.GetCount() != 1 )
return wxDataViewItem();
//-----------------------------------------------------------------------------
// wxDataViewCtrl
//-----------------------------------------------------------------------------
+WX_DEFINE_LIST(wxDataViewColumnList);
IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
if (!wxDataViewCtrlBase::AppendColumn(col))
return false;
+ m_cols.Append( col );
OnColumnChange();
return true;
}
m_clientArea->UpdateDisplay();
}
+unsigned int wxDataViewCtrl::GetColumnCount() const
+{
+ return m_cols.GetCount();
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+ wxDataViewColumnList::const_iterator iter;
+ int i = 0;
+ for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
+ {
+ if (i == pos)
+ return *iter;
+
+ if ((*iter)->IsHidden())
+ continue;
+ i ++;
+ }
+ return NULL;
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+ wxDataViewColumnList::Node * ret = m_cols.Find( column );
+ if (ret == NULL)
+ return false;
+
+ m_cols.Erase(ret);
+ delete column;
+ OnColumnChange();
+
+ return true;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+ m_cols.clear();
+ OnColumnChange();
+ return true;
+}
+
//Selection code with wxDataViewItem as parameters
-wxDataViewItem wxDataViewCtrl::GetSelection()
+wxDataViewItem wxDataViewCtrl::GetSelection() const
{
return m_clientArea->GetSelection();
}
{
int row = m_clientArea->GetRowByItem( item );
if( row >= 0 )
+ {
+ //Unselect all rows before select another in the single select mode
+ if (m_clientArea->IsSingleSel())
+ m_clientArea->SelectAllRows(false);
m_clientArea->SelectRow(row, true);
+ }
}
void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
void wxDataViewCtrl::Select( int row )
{
if( row >= 0 )
+ {
+ if (m_clientArea->IsSingleSel())
+ m_clientArea->SelectAllRows(false);
m_clientArea->SelectRow( row, true );
+ }
}
void wxDataViewCtrl::Unselect( int row )
m_clientArea->SelectAllRows(false);
}
-void wxDataViewCtrl::EnsureVisible( int row )
+void wxDataViewCtrl::EnsureVisible( int row, int column )
{
- m_clientArea->ScrollTo( row );
+ if( row < 0 )
+ row = 0;
+ if( row > m_clientArea->GetRowCount() )
+ row = m_clientArea->GetRowCount();
+
+ int first = m_clientArea->GetFirstVisibleRow();
+ int last = m_clientArea->GetLastVisibleRow();
+ if( row < first )
+ m_clientArea->ScrollTo( row, column );
+ else if( row > last )
+ m_clientArea->ScrollTo( row - last + first, column );
+ else
+ m_clientArea->ScrollTo( first, column );
}
-void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, wxDataViewColumn * column )
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column )
{
int row = m_clientArea->GetRowByItem(item);
if( row >= 0 )
- EnsureVisible(row);
+ {
+ if( column == NULL )
+ return EnsureVisible(row, -1);
+ else
+ {
+ int col = 0;
+ int len = GetColumnCount();
+ for( int i = 0; i < len; i ++ )
+ if( GetColumn(i) == column )
+ {
+ col = i;
+ break;
+ }
+ EnsureVisible( row, col );
+ }
+ }
+
}
-void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, unsigned int & column ) const
+void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const
{
m_clientArea->HitTest(point, item, column);
}
-wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, unsigned int column ) const
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const
{
return m_clientArea->GetItemRect(item, column);
}
return m_clientArea->GetRowByItem( item );
}
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+ int row = m_clientArea->GetRowByItem( item );
+ if (row != -1)
+ m_clientArea->Expand(row);
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+ int row = m_clientArea->GetRowByItem( item );
+ if (row != -1)
+ m_clientArea->Collapse(row);
+}
+
#endif
// !wxUSE_GENERICDATAVIEWCTRL
projects / wxWidgets.git / blobdiff