Index: src/ch/ProgressListBox.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rf703b71b8c856e2538283555e9fdbc84918677c3 --- src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision f703b71b8c856e2538283555e9fdbc84918677c3) @@ -19,22 +19,18 @@ #ifndef __PROGRESSLISTBOX_H__ #define __PROGRESSLISTBOX_H__ -#include "memdc.h" -#include "afxtempl.h" -#include "structs.h" - ///////////////////////////////////////////////////////////////////////////// // CProgressListBox window struct _PROGRESSITEM_ { CString m_strText; - + UINT m_uiPos; UINT m_uiRange; COLORREF m_crColor; - CTask* m_pTask; + CTaskPtr m_spTask; }; class CProgressListBox : public CListBox @@ -48,7 +44,7 @@ // Operations public: - CArray<_PROGRESSITEM_*, _PROGRESSITEM_*> m_items; + std::vector<_PROGRESSITEM_*> m_vItems; protected: bool m_bShowCaptions; @@ -57,7 +53,7 @@ // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CProgressListBox) - public: +public: virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); //}}AFX_VIRTUAL