From: Vadim Zeitlin Date: Tue, 6 Nov 2012 16:51:41 +0000 (+0000) Subject: No changes, just fix indentation in wxDataViewMainWindow::Expand(). X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5d2ebe49dfc05b38d83cace85f927baf04d3b6a1 No changes, just fix indentation in wxDataViewMainWindow::Expand(). The code was indented two extra levels for some reason. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 7f112e8f48..89bc7ebfc0 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3085,44 +3085,44 @@ void wxDataViewMainWindow::Expand( unsigned int row ) 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; iGetSubTreeCount(); + for(unsigned i=0; i 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)