Index: src/ch/MiniViewDlg.h =================================================================== diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r71c49ab6ac2e657dee997cb9129c7d0d4dde21b6 --- src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 71c49ab6ac2e657dee997cb9129c7d0d4dde21b6) @@ -22,6 +22,7 @@ ///////////////////////////////////////////////////////////////////////////// // CMiniViewDlg dialog #include "ProgressListBox.h" +#include namespace chcore { @@ -41,14 +42,16 @@ public: struct _BTNDATA_ { - void (*pfnCallbackFunc)(CMiniViewDlg*, UINT, _BTNDATA_*, CDC*); // callback - click - int iPosition; // button pos counting from right - bool bPressed; // is it pressed ? - bool bEnabled; // is it enabled ? + void (*pfnCallbackFunc)(CMiniViewDlg*, UINT, _BTNDATA_*, CDC*) = nullptr; // callback - click + int iPosition = 0; // button pos counting from right + bool bPressed = false; // is it pressed ? + bool bEnabled = false; // is it enabled ? CRect rcButton; // filled in OnNCPaint - } m_bdButtons[BTN_COUNT]; + }; + std::array<_BTNDATA_, BTN_COUNT> m_bdButtons; + // Construction public: CMiniViewDlg(chcore::TTaskManager* pArray, bool* pbHide, CWnd* pParent = nullptr); // standard constructor @@ -98,7 +101,6 @@ CBrush m_brBackground; int m_iLastHeight; bool m_bShown; - _PROGRESSITEM_ item; // cache bool m_bActive;