Index: src/ch/ProgressListBox.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r0d5b67ee96b435d63f7bf075dc8e28603793b187 --- src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/ProgressListBox.h (.../ProgressListBox.h) (revision 0d5b67ee96b435d63f7bf075dc8e28603793b187) @@ -19,22 +19,20 @@ #ifndef __PROGRESSLISTBOX_H__ #define __PROGRESSLISTBOX_H__ -#include "memdc.h" -#include "afxtempl.h" -#include "structs.h" +#include "../libchengine/TaskID.h" ///////////////////////////////////////////////////////////////////////////// // CProgressListBox window struct _PROGRESSITEM_ { CString m_strText; - + UINT m_uiPos; UINT m_uiRange; COLORREF m_crColor; - CTask* m_pTask; + chengine::taskid_t m_tTaskID; }; class CProgressListBox : public CListBox @@ -48,7 +46,7 @@ // Operations public: - CArray<_PROGRESSITEM_*, _PROGRESSITEM_*> m_items; + std::vector<_PROGRESSITEM_*> m_vItems; protected: bool m_bShowCaptions; @@ -57,14 +55,14 @@ // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CProgressListBox) - public: - virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct); +public: + void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) override; //}}AFX_VIRTUAL // Implementation public: void SetSmoothProgress(bool bSmoothProgress); - int SetCurSel( int nSelect ); + int SetCurrentSelection( int nSelect ); void Init(); void UpdateItems(int nLimit, bool bUpdateSize); // updates items in listbox