CLIST_INTERFACE::pfnDrawMenuItem => Clist_DrawMenuItem

10 files changed, 9 insertions, 8 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index a0abfb9c17..25107e17b2 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -401,8 +401,8 @@ type
     pfnContactListWndProc              : function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):int; stdcall;

                                        

     pfnCluiProtocolStatusChanged       : procedure (status:int; szProto:PAnsiChar); cdecl;

-    pfnDrawMenuItem                    : procedure (_para1:PDRAWITEMSTRUCT; _para2:HICON; _para3:HICON); cdecl;

-    pfnLoadCluiGlobalOpts              : procedure ; cdecl;

+    blablablabla4                      : procedure; cdecl;

+    pfnLoadCluiGlobalOpts              : procedure; cdecl;

     pfnInvalidateRect                  : function (hwnd:HWND; var lpRect:TRECT; bErase:bool):bool; cdecl;

     pfnOnCreateClc                     : procedure ; cdecl;

                                        

diff --git a/include/m_clistint.h b/include/m_clistint.h
index db88b62361..cce531b480 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -253,6 +253,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam
 EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);

 

 EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);

+EXTERN_C MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

 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(void) Clist_InitAutoRebuild(HWND hWnd);

 EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void);

@@ -403,7 +404,7 @@ struct CLIST_INTERFACE
 	LRESULT (CALLBACK *pfnContactListWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

 	void (*pfnCluiProtocolStatusChanged)(int status, const char *szProto);

-	void (*pfnDrawMenuItem)(LPDRAWITEMSTRUCT, HICON, HICON);

+	int  (*blablabla4)();

 	void (*pfnLoadCluiGlobalOpts)(void);

 	BOOL (*pfnInvalidateRect)(HWND hwnd, CONST RECT* lpRect, BOOL bErase);

 	void (*pfnOnCreateClc)(void);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 809fcde091..0e8b553f73 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 60da632517..e605ec1ad7 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index bc970f3aa0..1e8ab1e3df 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -120,7 +120,7 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 					if (nmi) {

 						iIcon = Clist_GetContactIcon(nmi->hContact);

 						hIcon = ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL);

-						pcli->pfnDrawMenuItem(dis, hIcon, nmi->hIcon);

+						Clist_DrawMenuItem(dis, hIcon, nmi->hIcon);

 						return TRUE;

 					}

 				}

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 9556bbb635..98a1f82a2c 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -172,7 +172,6 @@ VOID CALLBACK fnTrayCycleTimerProc(HWND hwnd, UINT message, UINT_PTR idEvent, DW
 LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 void fnLoadCluiGlobalOpts(void);

 void fnCluiProtocolStatusChanged(int, const char*);

-void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

 

 /* contact.c */

 int  fnSetHideOffline(int iValue);

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index aa2dc60f76..4b8d96c67d 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -160,7 +160,6 @@ void InitClistCore()
 	cli.pfnContactListWndProc = fnContactListWndProc;

 	cli.pfnLoadCluiGlobalOpts = fnLoadCluiGlobalOpts;

 	cli.pfnCluiProtocolStatusChanged = fnCluiProtocolStatusChanged;

-	cli.pfnDrawMenuItem = fnDrawMenuItem;

 	cli.pfnInvalidateRect = fnInvalidateRect;

 	cli.pfnOnCreateClc = fnOnCreateClc;

 

diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp
index 74f6341ea0..326bca9740 100644
--- a/src/mir_app/src/clui.cpp
+++ b/src/mir_app/src/clui.cpp
@@ -350,7 +350,7 @@ int LoadCLUIModule(void)
 /////////////////////////////////////////////////////////////////////////////////////////

 // default contact list window procedure

 

-void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon)

+MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon)

 {

 	HBRUSH hBr;

 	BOOL bfm = FALSE;

@@ -999,7 +999,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			else if (dis->CtlType == ODT_MENU) {

 				if (dis->itemData == MENU_MIRANDAMENU) {

 					HICON hIcon = Skin_LoadIcon(SKINICON_OTHER_MAINMENU);

-					fnDrawMenuItem(dis, CopyIcon(hIcon), nullptr);

+					Clist_DrawMenuItem(dis, CopyIcon(hIcon), nullptr);

 					IcoLib_ReleaseIcon(hIcon);

 					return TRUE;

 				}

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 96f3129575..c69ba57442 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -545,3 +545,4 @@ ExtraIcon_SetAll @564
 Clist_GetStatusModeDescription @565

 Clist_LoadContactTree @566

 Clist_ChangeContactIcon @567

+Clist_DrawMenuItem @568

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index d0587fc20f..2e76e5745a 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -545,3 +545,4 @@ ExtraIcon_SetAll @564
 Clist_GetStatusModeDescription @565

 Clist_LoadContactTree @566

 Clist_ChangeContactIcon @567

+Clist_DrawMenuItem @568