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

get rid of MSVC warning about possibly uninitialized variable in CalcAndSendEvent() and also make its code somewhat more structured

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-27 23:21:29 +00:00
parent 575cabba69
commit 7ead384579
1 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/common/lboxcmn.cpp
View File

@@ -109,17 +109,18 @@ void wxListBoxBase::CalcAndSendEvent()
wxArrayInt selections;
GetSelections(selections);
if ((selections.GetCount() == 0) && (m_oldSelections.GetCount() == 0))
if ( selections.empty() && m_oldSelections.empty() )
{
// nothing changed, just leave
return;
}
if (selections.GetCount() == m_oldSelections.GetCount())
const size_t countSel = selections.size(),
countSelOld = m_oldSelections.size();
if ( countSel == countSelOld )
{
bool changed = false;
size_t idx;
for (idx = 0; idx < selections.GetCount(); idx++)
for ( size_t idx = 0; idx < countSel; idx++ )
{
if (selections[idx] != m_oldSelections[idx])
{
@@ -133,21 +134,18 @@ void wxListBoxBase::CalcAndSendEvent()
return;
}
if (selections.GetCount() == 0)
int item = wxNOT_FOUND;
if ( selections.empty() )
{
// indicate that this is a deselection
event.SetExtraLong(0);
int item = m_oldSelections[0];
m_oldSelections = selections;
LBSendEvent( event, this, item );
return;
item = m_oldSelections[0];
}
int item;
else // we [still] have some selections
{
// Now test if any new item is selected
bool any_new_selected = false;
size_t idx;
for (idx = 0; idx < selections.GetCount(); idx++)
for ( size_t idx = 0; idx < countSel; idx++ )
{
item = selections[idx];
if ( m_oldSelections.Index(item) == wxNOT_FOUND )
@@ -161,14 +159,12 @@ void wxListBoxBase::CalcAndSendEvent()
{
// indicate that this is a selection
event.SetExtraLong(1);
m_oldSelections = selections;
LBSendEvent( event, this, item );
return;
}
else // no new items selected
{
// Now test if any new item is deselected
bool any_new_deselected = false;
for (idx = 0; idx < m_oldSelections.GetCount(); idx++)
for ( size_t idx = 0; idx < countSelOld; idx++ )
{
item = m_oldSelections[idx];
if ( selections.Index(item) == wxNOT_FOUND )
@@ -182,12 +178,20 @@ void wxListBoxBase::CalcAndSendEvent()
{
// indicate that this is a selection
event.SetExtraLong(0);
m_oldSelections = selections;
LBSendEvent( event, this, item );
return;
}
else
{
item = wxNOT_FOUND; // this should be impossible
}
}
}
wxLogError( wxT("Wrong wxListBox selection") );
wxASSERT_MSG( item != wxNOT_FOUND,
"Logic error in wxListBox selection event generation code" );
m_oldSelections = selections;
LBSendEvent(event, this, item);
}
// ----------------------------------------------------------------------------