From fe38c9abad4783a13596e227a29e159ef11d995a Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Mon, 29 May 2017 08:20:02 +0000 Subject: [PATCH] regedit: Move the listview's NM_SETFOCUS handling to listview.c. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- programs/regedit/childwnd.c | 12 ++++-------- programs/regedit/listview.c | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 34c6a942e23..653884260a9 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -471,14 +471,10 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa default: return 0; /* goto def; */ } - } else - if (((int)wParam == LIST_WINDOW) && (g_pChildWnd != NULL)) { - if (((LPNMHDR)lParam)->code == NM_SETFOCUS) { - g_pChildWnd->nFocusPanel = 1; - } else if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { - goto def; - } - } + } else if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { + if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) + goto def; + } break; case WM_SIZE: diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 3ebba33474d..b42af8e6b37 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -420,6 +420,9 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); } break; + case NM_SETFOCUS: + g_pChildWnd->nFocusPanel = 1; + break; case NM_DBLCLK: { NMITEMACTIVATE* nmitem = (LPNMITEMACTIVATE)lParam; LVHITTESTINFO info; -- 2.11.4.GIT