X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afebb87be1467f24f4ffe5e8cca2a94acc5248c8..a8e893433a1a4c247cee125816608135bb7bd4b1:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 936dc0f164..fb5dd4b30a 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -68,6 +68,12 @@ static const int EXPANDER_MARGIN = 4; #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 @@ -254,18 +260,16 @@ public: // 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; @@ -287,10 +291,19 @@ public: 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; } @@ -349,26 +362,15 @@ public: 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 ); } } @@ -382,20 +384,14 @@ private: 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 ); } @@ -436,13 +432,18 @@ public: 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(); } @@ -558,6 +559,8 @@ private: //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() @@ -989,6 +992,66 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m 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 // --------------------------------------------------------- @@ -1222,7 +1285,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() //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 @@ -1357,14 +1420,14 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA 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(); @@ -1528,7 +1591,7 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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; @@ -1599,10 +1662,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); w -= 6; - // erase the line if it was drawn - if (m_currentX < w) - DrawCurrent(); - if (event.ButtonUp()) { m_isDragging = false; @@ -1610,19 +1669,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) ReleaseMouse(); m_dirty = true; + } + m_currentX = wxMax(m_minX + 7, x); + if (m_currentX < w) + { GetColumn(m_column)->SetWidth(m_currentX - m_minX); - Refresh(); GetOwner()->Refresh(); } - else - { - m_currentX = wxMax(m_minX + 7, x); - - // draw in the new location - if (m_currentX < w) DrawCurrent(); - } } else // not dragging @@ -1677,7 +1732,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_isDragging = true; CaptureMouse(); m_currentX = x; - DrawCurrent(); } else // click on a column { @@ -1693,15 +1747,15 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) wxDataViewColumn *col = GetColumn(m_column); if(col->IsSortable()) { - unsigned int colnum = m_owner->GetSortingColumn(); - if(model && static_cast(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(); @@ -1724,8 +1778,12 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) } } +//I must say that this function is deprecated, but I think it is useful to keep it for a time void wxGenericDataViewHeaderWindow::DrawCurrent() { +#if 1 + GetColumn(m_column)->SetWidth(m_currentX - m_minX); +#else int x1 = m_currentX; int y1 = 0; ClientToScreen (&x1, &y1); @@ -1743,7 +1801,8 @@ void wxGenericDataViewHeaderWindow::DrawCurrent() dc.SetPen(m_penCurrent); dc.SetBrush(*wxTRANSPARENT_BRUSH); AdjustDC(dc); - dc.DrawLine(x1, y1, x2, y2); + dc.DrawLine(x1, y1, x2, y2 ); +#endif } void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) @@ -1844,6 +1903,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i //Make m_count = -1 will cause the class recaculate the real displaying number of rows. m_count = -1 ; + m_underMouse = NULL; UpdateDisplay(); } @@ -1904,7 +1964,7 @@ public: bool Walker( wxDataViewTreeNode * node, DoJob & func ) { - if( node==NULL || !node->HasChildren()) + if( node==NULL ) return false; switch( func( node ) ) @@ -2000,28 +2060,29 @@ void DestroyTreeHelper( wxDataViewTreeNode * node); 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() ); //Manuplate selection if( m_selection.GetCount() > 1 ) { - int row = m_selection[0]; m_selection.Empty(); - m_selection.Add(row); } - - if( GetOwner()->GetModel()->IsContainer( item ) ) + 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(); @@ -2035,25 +2096,29 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, } } - 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; } @@ -2301,6 +2366,14 @@ 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; @@ -2314,6 +2387,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 @@ -2333,7 +2407,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) //Draw the expander here. int indent = node->GetIndentLevel(); - if( col == GetOwner()->GetExpanderColumn() ) + if( col == expander ) { //Calculate the indent first indent = cell_rect.x + GetOwner()->GetIndent() * indent; @@ -2346,13 +2420,16 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 { @@ -2851,7 +2928,10 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) 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 @@ -2925,21 +3005,28 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item //Find the item along the parent-chain. //This algorithm is designed to speed up the node-finding method wxDataViewTreeNode * node = m_root; - for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() ) + for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ ) { 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() == (**iter)) + { + node = nodes[i]; + break; + } + } + if (i == nodes.GetCount()) return NULL; - node = nodes[index]; } else return NULL; @@ -2999,8 +3086,8 @@ int wxDataViewMainWindow::RecalculateCount() class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node ) - { this->item = item ; ret = -1 ; nd = node ; } + ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter ) + { this->item = item ; ret = -1 ; m_iter = iter ; } virtual ~ItemToRowJob(){}; //Maybe binary search will help to speed up this process @@ -3012,9 +3099,9 @@ public: return DoJob::OK; } - if( nd && node->GetItem() == *(nd->GetData())) + if( node->GetItem() == **m_iter ) { - nd = nd->GetNext(); + m_iter++ ; return DoJob::CONT; } else @@ -3035,7 +3122,7 @@ public: //the row number is begin from zero int GetResult(){ return ret -1 ; } private: - ItemList::Node * nd; + ItemList::const_iterator m_iter; wxDataViewItem item; int ret; @@ -3064,7 +3151,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) pItem = new wxDataViewItem( ); list.Insert( pItem ); - ItemToRowJob job( item, list.GetFirst() ); + ItemToRowJob job( item, list.begin() ); Walker(m_root , job ); return job.GetResult(); } @@ -3074,23 +3161,23 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie if( !model->IsContainer( item ) ) return ; - wxDataViewItem i = model->GetFirstChild( item ); - int num = 0; - while( i.IsOk() ) + wxDataViewItemArray children; + unsigned int num = model->GetChildren( item, children); + int index = 0; + while( index < num ) { - num ++; - if( model->IsContainer( i ) ) + if( model->IsContainer( children[index] ) ) { wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); - n->SetItem(i); + n->SetItem(children[index]); n->SetHasChildren( true ) ; node->AddNode( n ); } else { - node->AddLeaf( i.GetID() ); + node->AddLeaf( children[index].GetID() ); } - i = model->GetNextSibling( i ); + index ++; } node->SetSubTreeCount( num ); wxDataViewTreeNode * n = node->GetParent(); @@ -3222,9 +3309,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) 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; @@ -3243,16 +3329,55 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } 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()) @@ -3334,22 +3459,24 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Process the event of user clicking the expander bool expander = false; - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) + if (GetOwner()->GetExpanderColumn() == col) { - 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) ) - { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); - } + 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) ) + { + expander = true; + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding( current ); + } + } } - //If the user click the expander, we do not do editing even if the column with expander are editable if (m_lastOnSame && !expander ) { @@ -3399,9 +3526,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (event.LeftDown() || forceClick) { -#ifdef __WXMSW__ SetFocus(); -#endif m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -3651,7 +3776,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { - wxDataViewColumnList::Node * ret = m_cols.Find( column ); + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); if (ret == NULL) return false; @@ -3705,7 +3830,12 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item ) { 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 ) @@ -3755,7 +3885,11 @@ void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) 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 )