From adc215dceb172b5eec920d719e1601c293e447bd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 20:38:45 +0300 Subject: CLIST_INTERFACE::pfnEndRename => Clist_EndRename --- plugins/Clist_nicer/src/clc.cpp | 4 ++-- plugins/Clist_nicer/src/clcutils.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 89928963a2..51f00bb68d 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -256,7 +256,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L break; case WM_SIZE: - pcli->pfnEndRename(hwnd, dat, 1); + Clist_EndRename(dat, 1); KillTimer(hwnd, TIMERID_INFOTIP); KillTimer(hwnd, TIMERID_RENAME); pcli->pfnRecalcScrollBar(hwnd, dat); @@ -632,7 +632,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L return TRUE; case WM_CONTEXTMENU: - pcli->pfnEndRename(hwnd, dat, 1); + Clist_EndRename(dat, 1); Clist_HideInfoTip(dat); KillTimer(hwnd, TIMERID_RENAME); KillTimer(hwnd, TIMERID_INFOTIP); diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 5822512dbe..82e9722c2f 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -483,13 +483,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar case WM_KEYDOWN: switch (wParam) { case VK_RETURN: - pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1); + Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1); return 0; case VK_ESCAPE: - pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 0); + Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 0); return 0; } break; + case WM_GETDLGCODE: if (lParam) { MSG *msg = (MSG *)lParam; @@ -499,8 +500,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar return 0; } return DLGC_WANTMESSAGE; + case WM_KILLFOCUS: - pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1); + Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1); return 0; } return mir_callNextSubclass(hwnd, RenameEditSubclassProc, uMsg, wParam, lParam); -- cgit v1.2.3