From d23da874ccf331417729c407b474cfbad1f2ce53 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 15 Dec 2011 23:26:15 +0100 Subject: [PATCH] drop checks for Windows XP or later Signed-off-by: Sven Strickroth --- src/Git/GitStatusListCtrl.cpp | 12 ++---------- src/Git/GitStatusListCtrl.h | 16 ++-------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index f8d58a3e4..b0fd1eb9f 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -1721,14 +1721,6 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID()); - bool XPorLater = false; - OSVERSIONINFOEX inf; - SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX)); - inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&inf); - WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion); - if (fullver >= 0x0501) - XPorLater = true; //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000); CTGitPath * filepath; @@ -1740,7 +1732,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) ClientToScreen(&rect); point = rect.CenterPoint(); } - if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes)) + if ((GetSelectedCount() == 0) && (m_bHasCheckboxes)) { // nothing selected could mean the context menu is requested for // a group header @@ -2117,7 +2109,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point) popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP); popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP); #if 0 - if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater) + if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)) &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none)) { popup.AppendMenu(MF_SEPARATOR); diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h index 04e7a0752..acc834793 100644 --- a/src/Git/GitStatusListCtrl.h +++ b/src/Git/GitStatusListCtrl.h @@ -303,15 +303,6 @@ public: } void OnContextMenuHeader(CWnd * pWnd, CPoint point, bool isGroundEnable=false) { - bool XPorLater = false; - OSVERSIONINFOEX inf; - SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX)); - inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - GetVersionEx((OSVERSIONINFO *)&inf); - WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion); - if (fullver >= 0x0501) - XPorLater = true; - CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd; if ((point.x == -1) && (point.y == -1)) { @@ -332,11 +323,8 @@ public: // build control menu - if (XPorLater) - { - //temp.LoadString(IDS_STATUSLIST_SHOWGROUPS); - //popup.AppendMenu(isGroundEnable? uCheckedFlags : uUnCheckedFlags, columnCount, temp); - } + //temp.LoadString(IDS_STATUSLIST_SHOWGROUPS); + //popup.AppendMenu(isGroundEnable? uCheckedFlags : uUnCheckedFlags, columnCount, temp); if (AnyUnusedProperties()) { -- 2.11.4.GIT