From b37eb1791001e376f93127a2e5559aed4ab7208c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 26 Feb 2017 13:58:43 +0100 Subject: [PATCH] Make sure IDs fit into bitmap Commit 46b96924698a2160a3010abdfa49a940b3f5e03d caused a regression as e.g. ID_COMPARETWOCOMMITCHANGES did not match any more. Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListBase.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h index 03a071189..33f8ff566 100644 --- a/src/TortoiseProc/GitLogListBase.h +++ b/src/TortoiseProc/GitLogListBase.h @@ -331,14 +331,6 @@ public: ID_DIFF, ID_OPENWITH, ID_COPYCLIPBOARD, - ID_COPYCLIPBOARDFULL, - ID_COPYCLIPBOARDFULLNOPATHS, - ID_COPYCLIPBOARDHASH, - ID_COPYCLIPBOARDAUTHORSFULL, - ID_COPYCLIPBOARDAUTHORSNAME, - ID_COPYCLIPBOARDAUTHORSEMAIL, - ID_COPYCLIPBOARDSUBJECTS, - ID_COPYCLIPBOARDMESSAGES, ID_REVERTTOREV, ID_BLAMECOMPARE, ID_BLAMEDIFF, @@ -383,6 +375,15 @@ public: ID_BISECTSKIP, ID_SVNDCOMMIT, ID_COMPARETWOCOMMITCHANGES, + // the following can be >= 64 as those are not used for GetContextMenuBit(), all others must be < 64 in order to fit into __int64 + ID_COPYCLIPBOARDFULL, + ID_COPYCLIPBOARDFULLNOPATHS, + ID_COPYCLIPBOARDHASH, + ID_COPYCLIPBOARDAUTHORSFULL, + ID_COPYCLIPBOARDAUTHORSNAME, + ID_COPYCLIPBOARDAUTHORSEMAIL, + ID_COPYCLIPBOARDSUBJECTS, + ID_COPYCLIPBOARDMESSAGES, }; enum FilterShow { -- 2.11.4.GIT