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_modern/src/modern_clc.cpp | 4 ++-- plugins/Clist_modern/src/modern_clcutils.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 8bbd3bb437..25afd153fe 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -328,7 +328,7 @@ static LRESULT clcOnCommand(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM static LRESULT clcOnSize(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - pcli->pfnEndRename(hwnd, dat, 1); + Clist_EndRename(dat, 1); KillTimer(hwnd, TIMERID_INFOTIP); KillTimer(hwnd, TIMERID_RENAME); cliRecalcScrollBar(hwnd, dat); @@ -699,7 +699,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP KillTimer(hwnd, TIMERID_RENAME); KillTimer(hwnd, TIMERID_SUBEXPAND); - pcli->pfnEndRename(hwnd, dat, 1); + Clist_EndRename(dat, 1); dat->ptDragStart.x = (short)LOWORD(lParam); dat->ptDragStart.y = (short)HIWORD(lParam); diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 95382bf70b..04498d6ab0 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -216,13 +216,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(hwnd, GWLP_USERDATA), 1); + Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1); return 0; case VK_ESCAPE: - pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 0); + Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 0); return 0; } break; + case WM_GETDLGCODE: if (lParam) { MSG *msg = (MSG*)lParam; @@ -230,8 +231,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar if (msg->message == WM_CHAR && msg->wParam == '\t') return 0; } return DLGC_WANTMESSAGE; + case WM_KILLFOCUS: - pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1); + Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1); SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0); return 0; } -- cgit v1.2.3