From 8e6a28579846d35bc36966dfb50e2eb7f662471a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Apr 2018 22:13:32 +0300 Subject: CLIST_INTERFACE::pfnReloadExtraIcons => ExtraIcon_Reload() CLIST_INTERFACE::pfnSetAllExtraIcons => ExtraIcon_SetAll() --- src/mir_app/src/clcitems.cpp | 2 +- src/mir_app/src/clistcore.cpp | 4 ---- src/mir_app/src/clui.cpp | 4 ++-- src/mir_app/src/ei_services.cpp | 6 +++--- src/mir_app/src/extraicons.h | 3 --- src/mir_app/src/mir_app.def | 2 ++ src/mir_app/src/mir_app64.def | 2 ++ 7 files changed, 10 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index 15edcc8975..f0e5e596c4 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -428,7 +428,7 @@ void fnRebuildEntireList(HWND hwnd, ClcData *dat) } cli.pfnSortCLC(hwnd, dat, 0); - cli.pfnSetAllExtraIcons(0); + ExtraIcon_SetAll(); } int fnGetGroupContentsCount(ClcGroup *group, int visibleOnly) diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 8b08cb8757..90f7830740 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h" #include "clc.h" #include "genmenu.h" -#include "extraicons.h" int LoadContactListModule2(void); int LoadCLCModule(void); @@ -176,9 +175,6 @@ void InitClistCore() cli.pfnShowHide = fnShowHide; cli.pfnGetStatusModeDescription = fnGetStatusModeDescription; - cli.pfnReloadExtraIcons = fnReloadExtraIcons; - cli.pfnSetAllExtraIcons = fnSetAllExtraIcons; - cli.pfnTrayCalcChanged = fnTrayCalcChanged; cli.pfnSetContactCheckboxes = fnSetContactCheckboxes; } diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 493ed1ce8a..34214a3c1b 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -778,11 +778,11 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case CLN_NEWCONTACT: if (nmc != nullptr) - cli.pfnSetAllExtraIcons((UINT_PTR)nmc->hItem); + ExtraIcon_SetAll((UINT_PTR)nmc->hItem); return TRUE; case CLN_LISTREBUILT: - cli.pfnSetAllExtraIcons(0); + ExtraIcon_SetAll(); return FALSE; case NM_KEYDOWN: diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp index d35adfeeda..dbd905a978 100644 --- a/src/mir_app/src/ei_services.cpp +++ b/src/mir_app/src/ei_services.cpp @@ -275,7 +275,7 @@ MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon) return (res > 0xFFFE) ? INVALID_HANDLE_VALUE : (HANDLE)res; } -void fnReloadExtraIcons() +MIR_APP_DLL(void) ExtraIcon_Reload() { SendMessage(cli.hwndContactTree, CLM_SETEXTRASPACE, db_get_b(0, "CLUI", "ExtraColumnSpace", 18), 0); SendMessage(cli.hwndContactTree, CLM_SETEXTRAIMAGELIST, 0, 0); @@ -291,7 +291,7 @@ void fnReloadExtraIcons() bImageCreated = true; } -void fnSetAllExtraIcons(MCONTACT hContact) +MIR_APP_DLL(void) ExtraIcon_SetAll(MCONTACT hContact) { if (cli.hwndContactTree == nullptr) return; @@ -299,7 +299,7 @@ void fnSetAllExtraIcons(MCONTACT hContact) bool hcontgiven = (hContact != 0); if (!bImageCreated) - cli.pfnReloadExtraIcons(); + ExtraIcon_Reload(); SendMessage(cli.hwndContactTree, CLM_SETEXTRACOLUMNS, EXTRA_ICON_COUNT, 0); diff --git a/src/mir_app/src/extraicons.h b/src/mir_app/src/extraicons.h index 6c059ca4d7..fd896b3516 100644 --- a/src/mir_app/src/extraicons.h +++ b/src/mir_app/src/extraicons.h @@ -197,9 +197,6 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage); void DefaultExtraIcons_Load(); -void fnReloadExtraIcons(); -void fnSetAllExtraIcons(MCONTACT hContact); - static inline BOOL IsEmpty(const char *str) { return str == nullptr || str[0] == 0; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 8503cb7da8..d8d6ae9a11 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -540,3 +540,5 @@ Clist_GetContactIcon @559 Clist_GetAccountIndex @560 Menu_ReloadProtoMenus @561 Menu_GetProtocolMenu @562 +ExtraIcon_Reload @563 +ExtraIcon_SetAll @564 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 1db6bfddf7..333e4fc5f8 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -540,3 +540,5 @@ Clist_GetContactIcon @559 Clist_GetAccountIndex @560 Menu_ReloadProtoMenus @561 Menu_GetProtocolMenu @562 +ExtraIcon_Reload @563 +ExtraIcon_SetAll @564 -- cgit v1.2.3