Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r8068e0c351055554340ac9755d1bc846893bf2b8 --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) @@ -46,7 +46,7 @@ ///////////////////////////////////////////////////////////////////////////// // CMiniViewDlg dialog -CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pTaskManager, bool *pbHide, CWnd* pParent /*=NULL*/) +CMiniViewDlg::CMiniViewDlg(chcore::TTaskManager* pTaskManager, bool *pbHide, CWnd* pParent /*=nullptr*/) :ictranslate::CLanguageDialog(IDD_MINIVIEW_DIALOG, pParent, &m_bLock), m_iLastHeight(0), m_bShown(false), @@ -132,7 +132,7 @@ RefreshStatus(); - SetTimer(9843, GetPropValue(GetConfig()), NULL); + SetTimer(9843, GetPropValue(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; @@ -200,7 +200,7 @@ m_pTasks->GetStatsSnapshot(spTaskMgrStats); int index=0; - _PROGRESSITEM_* pItem=NULL; + _PROGRESSITEM_* pItem=nullptr; if(GetPropValue(GetConfig())) { @@ -300,7 +300,7 @@ RefreshStatus(); // set refresh timer - SetTimer(9843, GetPropValue(GetConfig()), NULL); + SetTimer(9843, GetPropValue(GetConfig()), nullptr); return static_cast(0); } @@ -659,7 +659,7 @@ void CMiniViewDlg::OnSelchangeProgressList() { RefreshStatus(); - RedrawWindow(NULL, NULL, RDW_INVALIDATE | RDW_FRAME); + RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME); // PostMessage(WM_NCPAINT); } @@ -687,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; } } @@ -706,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; } @@ -723,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); } @@ -754,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); } } }