From 00cee6a3f059f60929ce3140effdbbf7e9086bdd Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 16 Sep 2017 12:56:27 +0200 Subject: [PATCH] Replace the custom messages defined with WM_USER with registered messages to avoid conflicts Signed-off-by: Sven Strickroth --- src/TortoiseProc/BrowseRefsDlg.cpp | 4 ++-- src/TortoiseProc/CommitIsOnRefsDlg.cpp | 2 +- src/TortoiseProc/FileDiffDlg.cpp | 2 +- src/TortoiseProc/LogDlg.cpp | 4 ++-- src/Utils/MiscUI/FilterEdit.cpp | 4 ++++ src/Utils/MiscUI/FilterEdit.h | 6 +++--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp index b98a37e4a..167ae46b7 100644 --- a/src/TortoiseProc/BrowseRefsDlg.cpp +++ b/src/TortoiseProc/BrowseRefsDlg.cpp @@ -212,8 +212,8 @@ BEGIN_MESSAGE_MAP(CBrowseRefsDlg, CResizableStandAloneDialog) ON_NOTIFY(LVN_ENDLABELEDIT, IDC_LIST_REF_LEAFS, &CBrowseRefsDlg::OnLvnEndlabeleditListRefLeafs) ON_NOTIFY(LVN_BEGINLABELEDIT, IDC_LIST_REF_LEAFS, &CBrowseRefsDlg::OnLvnBeginlabeleditListRefLeafs) ON_EN_CHANGE(IDC_BROWSEREFS_EDIT_FILTER, &CBrowseRefsDlg::OnEnChangeEditFilter) - ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon) - ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) ON_WM_TIMER() ON_BN_CLICKED(IDC_CURRENTBRANCH, OnBnClickedCurrentbranch) ON_BN_CLICKED(IDC_INCLUDENESTEDREFS, &CBrowseRefsDlg::OnBnClickedIncludeNestedRefs) diff --git a/src/TortoiseProc/CommitIsOnRefsDlg.cpp b/src/TortoiseProc/CommitIsOnRefsDlg.cpp index ce2d9df6e..d900ed8f2 100644 --- a/src/TortoiseProc/CommitIsOnRefsDlg.cpp +++ b/src/TortoiseProc/CommitIsOnRefsDlg.cpp @@ -61,7 +61,7 @@ BEGIN_MESSAGE_MAP(CCommitIsOnRefsDlg, CResizableStandAloneDialog) ON_BN_CLICKED(IDC_SELREF, OnBnClickedSelRevBtn) ON_BN_CLICKED(IDC_LOG, OnBnClickedShowLog) ON_EN_CHANGE(IDC_FILTER, OnEnChangeEditFilter) - ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST_REF_LEAFS, OnItemChangedListRefs) ON_NOTIFY(NM_DBLCLK, IDC_LIST_REF_LEAFS, OnNMDblClickListRefs) ON_MESSAGE(ENAC_UPDATE, OnEnChangeCommit) diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index d6ae82a26..bb327e1b4 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -101,7 +101,7 @@ BEGIN_MESSAGE_MAP(CFileDiffDlg, CResizableStandAloneDialog) ON_NOTIFY(HDN_ITEMCLICK, 0, &CFileDiffDlg::OnHdnItemclickFilelist) ON_BN_CLICKED(IDC_REV1BTN, &CFileDiffDlg::OnBnClickedRev1btn) ON_BN_CLICKED(IDC_REV2BTN, &CFileDiffDlg::OnBnClickedRev2btn) - ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) ON_EN_CHANGE(IDC_FILTER, &CFileDiffDlg::OnEnChangeFilter) ON_WM_TIMER() ON_MESSAGE(ENAC_UPDATE, &CFileDiffDlg::OnEnUpdate) diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 148957aee..48e33aa68 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -147,8 +147,8 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog) ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton) ON_MESSAGE(WM_TGIT_REFRESH_SELECTION, OnRefreshSelection) - ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon) - ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon) + ON_REGISTERED_MESSAGE(CFilterEdit::WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter) ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading) diff --git a/src/Utils/MiscUI/FilterEdit.cpp b/src/Utils/MiscUI/FilterEdit.cpp index 79ebec225..a72bb0e34 100644 --- a/src/Utils/MiscUI/FilterEdit.cpp +++ b/src/Utils/MiscUI/FilterEdit.cpp @@ -20,6 +20,10 @@ #include "stdafx.h" #include "FilterEdit.h" + +const UINT CFilterEdit::WM_FILTEREDIT_INFOCLICKED = ::RegisterWindowMessage(L"TGITWM_FILTEREDIT_INFOCLICKED"); +const UINT CFilterEdit::WM_FILTEREDIT_CANCELCLICKED = ::RegisterWindowMessage(L"TGITWM_FILTEREDIT_CANCELCLICKED"); + IMPLEMENT_DYNAMIC(CFilterEdit, CEdit) CFilterEdit::CFilterEdit() diff --git a/src/Utils/MiscUI/FilterEdit.h b/src/Utils/MiscUI/FilterEdit.h index ada10e7ad..103b3377d 100644 --- a/src/Utils/MiscUI/FilterEdit.h +++ b/src/Utils/MiscUI/FilterEdit.h @@ -20,9 +20,6 @@ #pragma once #include -#define WM_FILTEREDIT_INFOCLICKED (WM_USER + 102) -#define WM_FILTEREDIT_CANCELCLICKED (WM_USER + 101) - /** * \ingroup Utils * Validator interface for the Filter edit control CFilterEdit @@ -71,6 +68,9 @@ public: CFilterEdit(); virtual ~CFilterEdit(); + static const UINT WM_FILTEREDIT_INFOCLICKED; + static const UINT WM_FILTEREDIT_CANCELCLICKED; + /** * Sets the icons to show for the cancel button. The first icon represents * the normal state, the second one when the button is pressed. -- 2.11.4.GIT