Index: src/ch/MiniViewDlg.cpp
===================================================================
diff -u -r011ceadef0413975974fa61983d903bf1a900ab6 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision 011ceadef0413975974fa61983d903bf1a900ab6)
+++ src/ch/MiniViewDlg.cpp	(.../MiniViewDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -24,6 +24,8 @@
 #include <assert.h>
 #include "MemDC.h"
 #include "../libchcore/TTaskManagerStatsSnapshot.h"
+#include "CfgProperties.h"
+#include "resource.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -44,21 +46,19 @@
 /////////////////////////////////////////////////////////////////////////////
 // CMiniViewDlg dialog
 
-CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pArray, bool *pbHide, CWnd* pParent /*=NULL*/)
+CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pTaskManager, bool *pbHide, CWnd* pParent /*=nullptr*/)
 	:ictranslate::CLanguageDialog(IDD_MINIVIEW_DIALOG, pParent, &m_bLock),
-	m_spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot)
+	m_iLastHeight(0),
+	m_bShown(false),
+	m_pTasks(pTaskManager),
+	m_bActive(false),
+	m_iIndex(-1),
+	m_pbHide(pbHide)
 {
 	COLORREF cr3DFace = GetSysColor(COLOR_3DFACE);
 	m_brBackground.CreateSolidBrush(cr3DFace);
-	m_iLastHeight=0;
-	m_bShown=false;
-	m_pTasks=pArray;
-	m_bActive=false;
-	m_iIndex=-1;
-	m_pbHide=pbHide;
 }
 
-
 void CMiniViewDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CLanguageDialog::DoDataExchange(pDX);
@@ -132,7 +132,7 @@
 
 		RefreshStatus();
 
-		SetTimer(9843, GetPropValue<PP_MVREFRESHINTERVAL>(GetConfig()), NULL);
+		SetTimer(9843, GetPropValue<PP_MVREFRESHINTERVAL>(GetConfig()), nullptr);
 	}
 
 	CLanguageDialog::OnTimer(nIDEvent);
@@ -174,7 +174,7 @@
 		iHeight += (sg_iMargin - iYMargin);
 
 	// place listbox in the best place
-	m_ctlStatus.SetWindowPos(NULL, iListXOffset, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+	m_ctlStatus.SetWindowPos(nullptr, iListXOffset, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 
 	// size of a dialog and screen
 	CRect rcDialog, rcScreen;
@@ -195,17 +195,19 @@
 	if(!m_pTasks)
 		return;
 
-	m_pTasks->GetStatsSnapshot(m_spTaskMgrStats);
+	chcore::TTaskManagerStatsSnapshotPtr spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot);
 
+	m_pTasks->GetStatsSnapshot(spTaskMgrStats);
+
 	int index=0;
-	_PROGRESSITEM_* pItem=NULL;
+	_PROGRESSITEM_* pItem=nullptr;
 
 	if(GetPropValue<PP_MVSHOWSINGLETASKS>(GetConfig()))
 	{
-		size_t stTasksCount = m_spTaskMgrStats->GetTaskStatsCount();
+		size_t stTasksCount = spTaskMgrStats->GetTaskStatsCount();
 		for(size_t stIndex = 0; stIndex < stTasksCount; ++stIndex)
 		{
-			chcore::TTaskStatsSnapshotPtr spTaskStats = m_spTaskMgrStats->GetTaskStatsAt(stIndex);
+			chcore::TTaskStatsSnapshotPtr spTaskStats = spTaskMgrStats->GetTaskStatsAt(stIndex);
 			chcore::ETaskCurrentState eTaskState = spTaskStats->GetTaskState();
 
 			if(eTaskState != chcore::eTaskState_Finished && eTaskState != chcore::eTaskState_Cancelled && eTaskState != chcore::eTaskState_LoadError)
@@ -274,7 +276,7 @@
 	pItem=m_ctlStatus.GetItemAddress(index++);
 	pItem->m_crColor=GetSysColor(COLOR_HIGHLIGHT);
 	pItem->m_strText=GetResManager().LoadString(IDS_MINIVIEWALL_STRING);
-	pItem->m_uiPos = boost::numeric_cast<int>(m_spTaskMgrStats->GetCombinedProgress() * 100.0);
+	pItem->m_uiPos = boost::numeric_cast<int>(spTaskMgrStats->GetCombinedProgress() * 100.0);
 	pItem->m_tTaskID = chcore::NoTaskID;
 
 	// get rid of the rest
@@ -298,7 +300,7 @@
 		RefreshStatus();
 		
 		// set refresh timer
-		SetTimer(9843, GetPropValue<PP_MVREFRESHINTERVAL>(GetConfig()), NULL);
+		SetTimer(9843, GetPropValue<PP_MVREFRESHINTERVAL>(GetConfig()), nullptr);
 
 		return static_cast<LRESULT>(0);
 	}
@@ -657,7 +659,7 @@
 void CMiniViewDlg::OnSelchangeProgressList() 
 {
 	RefreshStatus();
-	RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
+	RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
 //	PostMessage(WM_NCPAINT);
 }
 
@@ -685,8 +687,8 @@
 				m_iIndex=i;
 				m_bdButtons[i].bPressed=true;
 				SetCapture();
-				RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
-//				PostMessage(WM_NCPAINT, NULL, NULL);
+				RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
+//				PostMessage(WM_NCPAINT, nullptr, nullptr);
 				return;
 			}
 		}
@@ -704,9 +706,9 @@
 	if (m_iIndex != -1 && m_bdButtons[m_iIndex].bPressed)
 	{
 		m_bdButtons[m_iIndex].bPressed=false;
-		RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
-//		PostMessage(WM_NCPAINT, NULL, NULL);
-		m_bdButtons[m_iIndex].pfnCallbackFunc(this, MSG_ONCLICK, &m_bdButtons[m_iIndex], NULL);
+		RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
+//		PostMessage(WM_NCPAINT, nullptr, nullptr);
+		m_bdButtons[m_iIndex].pfnCallbackFunc(this, MSG_ONCLICK, &m_bdButtons[m_iIndex], nullptr);
 		bProcessed=true;
 	}
 
@@ -721,21 +723,21 @@
 BOOL CMiniViewDlg::OnNcActivate(BOOL bActive) 
 {
 	m_bActive=bActive != 0;
-	RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
+	RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
 //	PostMessage(WM_NCPAINT);	
 	return TRUE/*bResult*/;
 }
 
 void CMiniViewDlg::OnSetfocusProgressList() 
 {
-	RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
+	RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
 //	PostMessage(WM_NCPAINT);	
 }
 
 void CMiniViewDlg::OnSelcancelProgressList() 
 {
 	RefreshStatus();
-	RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
+	RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME);
 //	PostMessage(WM_NCPAINT);	
 }
 
@@ -752,15 +754,15 @@
 			if (!m_bdButtons[m_iIndex].bPressed)
 			{
 				m_bdButtons[m_iIndex].bPressed=true;
-				SendMessage(WM_NCPAINT, NULL, NULL);
+				SendMessage(WM_NCPAINT);
 			}
 		}
 		else
 		{
 			if (m_bdButtons[m_iIndex].bPressed)
 			{
 				m_bdButtons[m_iIndex].bPressed=false;
-				SendMessage(WM_NCPAINT, NULL, NULL);
+				SendMessage(WM_NCPAINT);
 			}
 		}
 	}