Index: src/ch/StatusDlg.h =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r1fa2eb7e39e2f8d84868d421fe1c4f0afc58d353 --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 1fa2eb7e39e2f8d84868d421fe1c4f0afc58d353) @@ -19,7 +19,7 @@ #ifndef __STATUSDLG_H__ #define __STATUSDLG_H__ -#include "structs.h" +#include "task.h" #include "FFListCtrl.h" #define WM_UPDATESTATUS WM_USER+6 @@ -36,32 +36,33 @@ void PostCloseMessage(); void SetBufferSizesString(UINT uiValue, int iIndex); void RefreshStatus(); - LPTSTR FormatTime(long lSeconds, LPTSTR lpszBuffer, size_t stMaxBufferSize); + LPTSTR FormatTime(time_t timeSeconds, LPTSTR lpszBuffer, size_t stMaxBufferSize); int GetImageFromStatus(UINT nStatus); void ApplyButtonsState(); void ApplyDisplayDetails(bool bInitial=false); - CTask* GetSelectedItemPointer(); + CTaskPtr GetSelectedItemPointer(); - void AddTaskInfo(int nPos, CTask *pTask, DWORD dwCurrentTime); + void AddTaskInfo(int nPos, const CTaskPtr& spTask, DWORD dwCurrentTime); void EnableControls(bool bEnable=true); CTaskArray* m_pTasks; - CTask* pSelectedItem; - const CTask *m_pLastSelected; - const CTask* m_pInitialSelection; + CTaskPtr m_spSelectedItem; + CTaskPtr m_spLastSelected; + CTaskPtr m_spInitialSelection; TCHAR m_szData[_MAX_PATH]; TCHAR m_szTimeBuffer1[40]; TCHAR m_szTimeBuffer2[40]; + TCHAR m_szTimeBuffer3[40]; __int64 m_i64LastProcessed; __int64 m_i64LastAllTasksProcessed; DWORD m_dwLastUpdate; LVITEM lvi; TASK_DISPLAY_DATA td; - CString m_strTemp, m_strTemp2; + CString m_strTemp; CImageList m_images; @@ -70,7 +71,6 @@ // Dialog Data //{{AFX_DATA(CStatusDlg) enum { IDD = IDD_STATUS_DIALOG }; - CEdit m_ctlErrors; CProgressCtrl m_ctlCurrentProgress; CFFListCtrl m_ctlStatusList; CProgressCtrl m_ctlProgressAll; @@ -91,6 +91,8 @@ protected: virtual void OnLanguageChanged(); + void PrepareResizableControls(); + // Generated message map functions //{{AFX_MSG(CStatusDlg) virtual BOOL OnInitDialog();