From ff3beb8902dc91ad183ec10d19d0ad12d2a6de93 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 5 Apr 2018 19:31:05 +0300 Subject: CLIST_INTERFACE::pfnDrawMenuItem => Clist_DrawMenuItem --- src/mir_app/src/clc.h | 1 - src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/clui.cpp | 4 ++-- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 -- cgit v1.2.3