From 10a3eaa7e69d5329b9d630ace4cbe4e24a56ab1d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 30 Jun 2017 17:09:39 +0200 Subject: [PATCH] Consistently use GetHeaderCtrl() instead of non-documented GetDlgItem(0) Signed-off-by: Sven Strickroth --- src/TortoiseMerge/FilePatchesDlg.cpp | 6 +++--- src/TortoiseProc/GitProgressList.cpp | 4 ++-- src/TortoiseProc/ResizableColumnsListCtrl.h | 10 ++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/TortoiseMerge/FilePatchesDlg.cpp b/src/TortoiseMerge/FilePatchesDlg.cpp index 89cdb2843..6c8ecab33 100644 --- a/src/TortoiseMerge/FilePatchesDlg.cpp +++ b/src/TortoiseMerge/FilePatchesDlg.cpp @@ -1,7 +1,7 @@ // TortoiseGitMerge - a Diff/Patch program // Copyright (C) 2006, 2008, 2010-2012, 2015 - TortoiseSVN -// Copyright (C) 2012, 2016 - Sven Strickroth +// Copyright (C) 2012, 2016-2017 - Sven Strickroth // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -126,7 +126,7 @@ BOOL CFilePatchesDlg::Init(GitPatch * pPatch, CPatchFilesDlgCallBack * pCallBack SetWindowTheme(m_cFileList.GetSafeHwnd(), L"Explorer", nullptr); m_cFileList.SetExtendedStyle(LVS_EX_INFOTIP | LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER); m_cFileList.DeleteAllItems(); - int c = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1; + int c = m_cFileList.GetHeaderCtrl()->GetItemCount() - 1; while (c>=0) m_cFileList.DeleteColumn(c--); m_cFileList.InsertColumn(0, CString(MAKEINTRESOURCE(IDS_PATH))); @@ -156,7 +156,7 @@ BOOL CFilePatchesDlg::Init(GitPatch * pPatch, CPatchFilesDlgCallBack * pCallBack SetStateText(i, state); } int mincol = 0; - int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1; + int maxcol = m_cFileList.GetHeaderCtrl()->GetItemCount() - 1; int col; for (col = mincol; col <= maxcol; col++) { diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index 5bf06e7a0..bbe4c385f 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -328,7 +328,7 @@ void CGitProgressList::ResizeColumns() TCHAR textbuf[MAX_PATH] = {0}; - CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl*)(GetDlgItem(0)); + auto pHeaderCtrl = GetHeaderCtrl(); if (pHeaderCtrl) { int maxcol = pHeaderCtrl->GetItemCount()-1; @@ -983,7 +983,7 @@ void CGitProgressList::Init() SetExtendedStyle((CRegDWORD(L"Software\\TortoiseGit\\FullRowSelect", TRUE) ? LVS_EX_FULLROWSELECT : 0) | LVS_EX_DOUBLEBUFFER); DeleteAllItems(); - int c = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1; + int c = GetHeaderCtrl()->GetItemCount()-1; while (c>=0) DeleteColumn(c--); diff --git a/src/TortoiseProc/ResizableColumnsListCtrl.h b/src/TortoiseProc/ResizableColumnsListCtrl.h index 5cf58328f..3251cec67 100644 --- a/src/TortoiseProc/ResizableColumnsListCtrl.h +++ b/src/TortoiseProc/ResizableColumnsListCtrl.h @@ -104,13 +104,19 @@ public: void AdjustColumnWidths() { - int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount() - 1; + auto header = GetHeaderCtrl(); + if (!header) + return; + int maxcol = header->GetItemCount() - 1; for (int col = 0; col <= maxcol; col++) SetColumnWidth(col, m_ColumnManager.GetWidth(col, true)); } virtual void SaveColumnWidths() { - int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount() - 1; + auto header = GetHeaderCtrl(); + if (!header) + return; + int maxcol = header->GetItemCount() - 1; for (int col = 0; col <= maxcol; col++) if (m_ColumnManager.IsVisible(col)) m_ColumnManager.ColumnResized(col); -- 2.11.4.GIT