CLIST_INTERFACE::pfnHideInfoTip => Clist_HideInfoTip

7 files changed, 16 insertions, 14 deletions

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index e3a10a32f8..56c949f004 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -647,7 +647,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 

 	case WM_VSCROLL:

 		cli.pfnEndRename(hwnd, dat, 1);

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		{

@@ -671,7 +671,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 

 	case WM_MOUSEWHEEL:

 		cli.pfnEndRename(hwnd, dat, 1);

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 

@@ -682,7 +682,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		return 0;

 

 	case WM_KEYDOWN:

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		if (!Clist_MenuProcessHotkey(wParam)) {

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

 

 	case WM_CHAR:

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		if (wParam == 27) //escape

@@ -811,7 +811,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 

 	case WM_SYSKEYDOWN:

 		cli.pfnEndRename(hwnd, dat, 1);

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		dat->iHotTrack = -1;

@@ -890,7 +890,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		if (GetFocus() != hwnd)

 			SetFocus(hwnd);

 

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		cli.pfnEndRename(hwnd, dat, 1);

@@ -987,7 +987,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 					Clist_InvalidateItem(hwnd, dat, iOldHotTrack);

 					Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 				}

-				cli.pfnHideInfoTip(hwnd, dat);

+				Clist_HideInfoTip(dat);

 			}

 			KillTimer(hwnd, TIMERID_INFOTIP);

 			if (wParam == 0 && dat->hInfoTipItem == 0) {

@@ -1164,7 +1164,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 	case WM_LBUTTONDBLCLK:

 		ReleaseCapture();

 		dat->iHotTrack = -1;

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 

@@ -1181,7 +1181,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 

 	case WM_CONTEXTMENU:

 		cli.pfnEndRename(hwnd, dat, 1);

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		if (GetFocus() != hwnd)

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

 

 	case WM_DESTROY:

-		cli.pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 

 		for (int i = 0; i <= FONTID_MAX; i++)

 			if (!dat->fontInfo[i].changed)

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 6da7cbae76..e34514a267 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -90,7 +90,7 @@ void fnCalcEipPosition(struct ClcData *dat, ClcContact *contact, ClcGroup *group
 int  fnGetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt);

 int  fnClcStatusToPf2(int status);

 int  fnIsHiddenMode(struct ClcData *dat, int status);

-void fnHideInfoTip(HWND hwnd, struct ClcData *dat);

+

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

 void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);

 void fnSetContactCheckboxes(ClcContact *cc, int checked);

diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index 079a7bc72c..27c846d2f8 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -613,7 +613,7 @@ struct SavedInfoState_t
 
 void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat)
 {
-	cli.pfnHideInfoTip(hwnd, dat);
+	Clist_HideInfoTip(dat);
 	KillTimer(hwnd, TIMERID_INFOTIP);
 	KillTimer(hwnd, TIMERID_RENAME);
 	cli.pfnEndRename(hwnd, dat, 1);
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index fb21c93e7b..57a4f4f5f9 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -635,7 +635,7 @@ int fnIsHiddenMode(ClcData *dat, int status)
 	return dat->offlineModes & cli.pfnClcStatusToPf2(status);

 }

 

-void fnHideInfoTip(HWND, ClcData *dat)

+MIR_APP_DLL(void) Clist_HideInfoTip(ClcData *dat)

 {

 	if (dat->hInfoTipItem == 0)

 		return;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 28a1171b96..8cbb0b23ac 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -108,7 +108,7 @@ void InitClistCore()
 	cli.pfnClcStatusToPf2 = fnClcStatusToPf2;

 	cli.pfnIsHiddenMode = fnIsHiddenMode;

 	cli.pfnIsVisibleContact = fnIsVisibleContact;

-	cli.pfnHideInfoTip = fnHideInfoTip;

+

 	cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;

 	cli.pfnLoadClcOptions = fnLoadClcOptions;

 	cli.pfnGetRowBottomY = fnGetRowBottomY;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 284713443f..d556c0ea3d 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -563,3 +563,4 @@ Clist_RecalculateGroupCheckboxes @582
 Clist_GetFontSetting @583

 Clist_GetDefaultExStyle @584

 Clist_NotifyNewContact @585

+Clist_HideInfoTip @586

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bb3890fc94..e4fdc729e1 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -563,3 +563,4 @@ Clist_RecalculateGroupCheckboxes @582
 Clist_GetFontSetting @583

 Clist_GetDefaultExStyle @584

 Clist_NotifyNewContact @585

+Clist_HideInfoTip @586