Index: src/ch/MiniViewDlg.h =================================================================== diff -u -r22573f5fa8bfbf68a19deb7631962e026f028045 -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 --- src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 22573f5fa8bfbf68a19deb7631962e026f028045) +++ src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8) @@ -21,9 +21,14 @@ ///////////////////////////////////////////////////////////////////////////// // CMiniViewDlg dialog -#include "task.h" #include "ProgressListBox.h" +#include "..\libchcore\TTask.h" +namespace chcore +{ + class chcore::TTaskManager; +} + #define BTN_COUNT 5 #define MSG_DRAWBUTTON 1 @@ -47,7 +52,7 @@ // Construction public: - CMiniViewDlg(CTaskArray* pArray, bool* pbHide, CWnd* pParent = NULL); // standard constructor + CMiniViewDlg(chcore::TTaskManager* pArray, bool* pbHide, CWnd* pParent = NULL); // standard constructor void ShowWindow(); void HideWindow(); @@ -64,40 +69,10 @@ virtual UINT GetLanguageUpdateOptions() { return LDF_NODIALOGSIZE; }; virtual void OnLanguageChanged(); - // from CMainWnd - CTaskArray *m_pTasks; - - CBrush m_brBackground; - int m_iLastHeight; - bool m_bShown; - _PROGRESSITEM_ item; - - // cache - TASK_MINI_DISPLAY_DATA m_tMiniDisplayData; - bool m_bActive; - - // lock - static bool m_bLock; - bool *m_pbHide; // does the big status dialog visible ? - - // in onmousemove points to last pressed button - int m_iIndex; - - CProgressListBox m_ctlStatus; - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMiniViewDlg) - public: - protected: +protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam); - //}}AFX_VIRTUAL -// Implementation -protected: - // Generated message map functions - //{{AFX_MSG(CMiniViewDlg) afx_msg HBRUSH OnCtlColor(CDC*, CWnd*, UINT); virtual BOOL OnInitDialog(); afx_msg void OnTimer(UINT_PTR nIDEvent); @@ -111,11 +86,32 @@ afx_msg void OnMouseMove(UINT nFlags, CPoint point); afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection); afx_msg void OnDblclkProgressList(); - //}}AFX_MSG + DECLARE_MESSAGE_MAP() -}; -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. +public: + static bool m_bLock; +private: + // from CMainWnd + chcore::TTaskManager *m_pTasks; + chcore::TTaskManagerStatsSnapshotPtr m_spTaskMgrStats; + + CBrush m_brBackground; + int m_iLastHeight; + bool m_bShown; + _PROGRESSITEM_ item; + + // cache + bool m_bActive; + + // lock + bool *m_pbHide; // is the big status dialog visible ? + + // in onmousemove points to last pressed button + int m_iIndex; + + CProgressListBox m_ctlStatus; +}; + #endif