CLIST_INTERFACE::pfnHideInfoTip => Clist_HideInfoTip

13 files changed, 25 insertions, 22 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index ff05bde11a..a841d04fcf 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -354,7 +354,7 @@ type
     pfnGetDropTargetInformation        : function  (hwnd:HWND; var dat:TClcData; pt:TPOINT):int; cdecl;

     pfnClcStatusToPf2                  : function  (status:int):int; cdecl;

     pfnIsHiddenMode                    : function  (var dat:TClcData; status:int):int; cdecl;

-    pfnHideInfoTip                     : procedure (hwnd:HWND; var dat:TClcData); cdecl;

+    blablablabla10                     : procedure; cdecl;

     blablablabla9                      : procedure; cdecl;

     blablablabla8                      : procedure; cdecl;

     pfnGetDefaultFontSetting           : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index ec852fa122..e40a9053fe 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -258,6 +258,7 @@ EXTERN_C MIR_APP_DLL(int)      Clist_EventsProcessTrayDoubleClick(int index);
 EXTERN_C MIR_APP_DLL(bool)     Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

 EXTERN_C MIR_APP_DLL(DWORD)    Clist_GetDefaultExStyle(void);

 EXTERN_C MIR_APP_DLL(void)     Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);

+EXTERN_C MIR_APP_DLL(void)     Clist_HideInfoTip(ClcData *dat);

 EXTERN_C MIR_APP_DLL(void)     Clist_InitAutoRebuild(HWND hWnd);

 EXTERN_C MIR_APP_DLL(void)     Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem);

 EXTERN_C MIR_APP_DLL(void)     Clist_LoadContactTree(void);

@@ -367,7 +368,7 @@ struct CLIST_INTERFACE
 	int            (*pfnGetDropTargetInformation)(HWND hwnd, ClcData *dat, POINT pt);

 	int            (*pfnClcStatusToPf2)(int status);

 	int            (*pfnIsHiddenMode)(ClcData *dat, int status);

-	void           (*pfnHideInfoTip)(HWND hwnd, ClcData *dat);

+	void           (*blablablabla10)();

 	void           (*blablablabla9)();

 	void           (*blablablabla8)();

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

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 8946abe871..feee9e5aa6 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index cf129a5cdd..d4a10c3d97 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 2f73560dd5..5f8eaafd69 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -405,7 +405,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 	if (wParam == VK_CONTROL)

 		return 0;

 

-	pcli->pfnHideInfoTip(hwnd, dat);

+	Clist_HideInfoTip(dat);

 	KillTimer(hwnd, TIMERID_INFOTIP);

 	KillTimer(hwnd, TIMERID_RENAME);

 

@@ -687,7 +687,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 	}

 

 	fMouseUpped = FALSE;

-	pcli->pfnHideInfoTip(hwnd, dat);

+	Clist_HideInfoTip(dat);

 	KillTimer(hwnd, TIMERID_INFOTIP);

 	KillTimer(hwnd, TIMERID_RENAME);

 	KillTimer(hwnd, TIMERID_SUBEXPAND);

@@ -815,7 +815,7 @@ static LRESULT clcOnCaptureChanged(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM
 			i = dat->iHotTrack;

 			dat->iHotTrack = -1;

 			Clist_InvalidateItem(hwnd, dat, i);

-			pcli->pfnHideInfoTip(hwnd, dat);

+			Clist_HideInfoTip(dat);

 		}

 	}

 	return 0;

@@ -892,7 +892,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				Clist_InvalidateItem(hwnd, dat, dat->iHotTrack);

 			}

 

-			pcli->pfnHideInfoTip(hwnd, dat);

+			Clist_HideInfoTip(dat);

 		}

 

 		KillTimer(hwnd, TIMERID_INFOTIP);

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index e4598bb954..9683a875c1 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -609,7 +609,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	case WM_LBUTTONDBLCLK:

 		ReleaseCapture();

 		dat->iHotTrack = -1;

-		pcli->pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 

@@ -633,7 +633,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 	case WM_CONTEXTMENU:

 		pcli->pfnEndRename(hwnd, dat, 1);

-		pcli->pfnHideInfoTip(hwnd, dat);

+		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		if (GetFocus() != hwnd)

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