CLIST_INTERFACE::pfnDeleteFromContactList => Clist_DeleteFromContactList

2 files changed, 17 insertions, 8 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index abce896da1..8bbd3bb437 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -451,8 +451,15 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 		SetCapture(hwnd);

 		return 0;

 

-	case VK_F2: cliBeginRenameSelection(hwnd, dat); /*SetCapture(hwnd);*/ return 0;

-	case VK_DELETE: pcli->pfnDeleteFromContactList(hwnd, dat); SetCapture(hwnd); return 0;

+	case VK_F2:

+		cliBeginRenameSelection(hwnd, dat); 

+		return 0;

+	

+	case VK_DELETE:

+		Clist_DeleteFromContactList(hwnd, dat);

+		SetCapture(hwnd);

+		return 0;

+	

 	case VK_ESCAPE:

 		if ((dat->dragStage & DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) {

 			dat->iDragItem = -1;

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 78baf5a889..fdb8027a3b 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -208,12 +208,14 @@ static int FillDialog(HWND hwnd)
 	ListView_InsertColumn(GetDlgItem(hwnd, IDC_PROTOCOLS), 0, &lvc);

 

 	// fill protocols...

-	LVITEMA item = { 0 };

-	item.mask = LVIF_TEXT;

-	item.iItem = 1000;

-	for (auto &pa : Accounts()) {

-		item.pszText = pa->szModuleName;

-		SendMessageA(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&item);

+	{

+		LVITEMA item = { 0 };

+		item.mask = LVIF_TEXT;

+		item.iItem = 1000;

+		for (auto &pa : Accounts()) {

+			item.pszText = pa->szModuleName;

+			SendMessageA(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&item);

+		}

 	}

 

 	ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);