Index: src/ch/ProgressListBox.cpp =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af --- src/ch/ProgressListBox.cpp (.../ProgressListBox.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/ProgressListBox.cpp (.../ProgressListBox.cpp) (revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af) @@ -17,7 +17,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "stdafx.h" -#include "../libchcore/TTaskManager.h" #include "ProgressListBox.h" #include "MemDC.h" @@ -174,13 +173,11 @@ { if(boost::numeric_cast(m_vItems.size()) > iIndex) return m_vItems.at(iIndex); - else - { - _PROGRESSITEM_* pItem=new _PROGRESSITEM_; - pItem->m_uiRange=100; - m_vItems.push_back(pItem); - return pItem; - } + + _PROGRESSITEM_* pItem=new _PROGRESSITEM_; + pItem->m_uiRange=100; + m_vItems.push_back(pItem); + return pItem; } void CProgressListBox::UpdateItems(int nLimit, bool bUpdateSize) @@ -229,9 +226,9 @@ return FALSE/*CListBox::OnEraseBkgnd(pDC)*/; } -int CProgressListBox::SetCurSel(int nSelect) +int CProgressListBox::SetCurrentSelection(int nSelect) { - int nResult=static_cast(this)->SetCurSel(nSelect); + int nResult=SetCurSel(nSelect); if (nSelect == -1) GetParent()->SendMessage(WM_COMMAND, (LBN_SELCANCEL << 16) | GetDlgCtrlID(), reinterpret_cast(this->m_hWnd)); @@ -240,7 +237,7 @@ void CProgressListBox::OnKillfocus() { - SetCurSel(-1); + SetCurrentSelection(-1); } void CProgressListBox::SetSmoothProgress(bool bSmoothProgress)