CLIST_INTERFACE::pfnEndRename => Clist_EndRename

8 files changed, 16 insertions, 14 deletions

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index a39309ef12..d1a0c27f72 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -307,7 +307,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_SIZE:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		cli.pfnRecalcScrollBar(hwnd, dat);

@@ -646,7 +646,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_VSCROLL:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -670,7 +670,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_MOUSEWHEEL:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -810,7 +810,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_SYSKEYDOWN:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -893,7 +893,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		dat->ptDragStart.x = (short)LOWORD(lParam);

 		dat->ptDragStart.y = (short)HIWORD(lParam);

 		if (!dat->bFilterSearch)

@@ -1180,7 +1180,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_CONTEXTMENU:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 3889fd56aa..b1dcc58dc2 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -83,7 +83,6 @@ void fnRecalcScrollBar(HWND hwnd, ClcData *dat);
 void fnSetGroupExpand(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);

 void fnDoSelectionDefaultAction(HWND hwnd, ClcData *dat);

 int  fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);

-void fnEndRename(HWND hwnd, ClcData *dat, int save);

 

 void fnBeginRenameSelection(HWND hwnd, ClcData *dat);

 void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour);

diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index d43373dc82..0ab68940a7 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -616,7 +616,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat)
 	Clist_HideInfoTip(dat);
 	KillTimer(hwnd, TIMERID_INFOTIP);
 	KillTimer(hwnd, TIMERID_RENAME);
-	cli.pfnEndRename(hwnd, dat, 1);
+	Clist_EndRename(dat, 1);
 
 	dat->bLockScrollbar = true;
 
diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index 892cc014b7..c13bf9924a 100644
--- a/src/mir_app/src/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -92,7 +92,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 		break;

 

 	case CLM_ENDEDITLABELNOW:

-		cli.pfnEndRename(hwnd, dat, wParam);

+		Clist_EndRename(dat, wParam);

 		break;

 

 	case CLM_ENSUREVISIBLE:

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 79ed8b3af9..3087ea488e 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -410,7 +410,7 @@ int fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)
 	return -1;

 }

 

-void fnEndRename(HWND, ClcData *dat, int save)

+MIR_APP_DLL(void) Clist_EndRename(ClcData *dat, int save)

 {

 	HWND hwndEdit = dat->hwndRenameEdit;

 	if (hwndEdit == nullptr)

@@ -475,13 +475,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 	case WM_KEYDOWN:

 		switch (wParam) {

 		case VK_RETURN:

-			cli.pfnEndRename(GetParent(hwnd), (ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

+			Clist_EndRename((ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

 			return 0;

 		case VK_ESCAPE:

-			cli.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;

@@ -491,8 +492,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 				return 0;

 		}

 		return DLGC_WANTMESSAGE;

+	

 	case WM_KILLFOCUS:

-		cli.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);

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index a7f1bc9572..f93ff81f87 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -100,7 +100,6 @@ void InitClistCore()
 	cli.pfnSetGroupExpand = fnSetGroupExpand;

 	cli.pfnDoSelectionDefaultAction = fnDoSelectionDefaultAction;

 	cli.pfnFindRowByText = fnFindRowByText;

-	cli.pfnEndRename = fnEndRename;

 	

 	cli.pfnBeginRenameSelection = fnBeginRenameSelection;

 	cli.pfnIsVisibleContact = fnIsVisibleContact;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index e999a3c97d..b776392554 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -568,3 +568,4 @@ Clist_IsHiddenMode @587
 Clist_ClcStatusToPf2 @588

 Clist_CalcEipPosition @589

 Clist_DeleteFromContactList @590

+Clist_EndRename @591

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bc5d92f576..eea6bae720 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -568,3 +568,4 @@ Clist_IsHiddenMode @587
 Clist_ClcStatusToPf2 @588

 Clist_CalcEipPosition @589

 Clist_DeleteFromContactList @590

+Clist_EndRename @591