From 1d0e5e12761293b41d0dede5276e198bb91d1f2e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 19:27:45 +0300 Subject: CLIST_INTERFACE::pfnRecalculateGroupCheckboxes => Clist_RecalculateGroupCheckboxes --- include/m_clistint.h | 3 ++- libs/win32/mir_app.lib | Bin 151052 -> 151356 bytes libs/win64/mir_app.lib | Bin 146484 -> 146770 bytes plugins/Clist_modern/src/modern_clc.cpp | 2 +- src/mir_app/src/clc.cpp | 4 ++-- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcitems.cpp | 2 +- src/mir_app/src/clcmsgs.cpp | 2 +- src/mir_app/src/clcutils.cpp | 2 +- src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 12 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/m_clistint.h b/include/m_clistint.h index 7ef1350b13..6a390bce28 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -259,6 +259,7 @@ EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, 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); +EXTERN_C MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat); EXTERN_C MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked); EXTERN_C MIR_APP_DLL(int) Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status); @@ -369,7 +370,7 @@ struct CLIST_INTERFACE void (*pfnGetDefaultFontSetting)(int i, LOGFONT *lf, COLORREF *colour); void (*pfnGetFontSetting)(int i, LOGFONT *lf, COLORREF *colour); void (*pfnLoadClcOptions)(HWND hwnd, ClcData *dat, BOOL bFirst); - void (*pfnRecalculateGroupCheckboxes)(HWND hwnd, ClcData *dat); + void (*blablablabla6)(); void (*blablablabla5)(); void (*blablablabla4)(); diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index e19b391503..537b06ff07 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 19dee28ef0..23071ff86c 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 9d60fbda9f..0aa55e9858 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -761,7 +761,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP Clist_SetGroupChildCheckboxes(contact->group, bNewState); else pcli->pfnSetContactCheckboxes(contact, bNewState); - pcli->pfnRecalculateGroupCheckboxes(hwnd, dat); + Clist_RecalculateGroupCheckboxes(dat); cliInvalidateRect(hwnd, nullptr, FALSE); NMCLISTCONTROL nm; diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index d6be92af35..c2b0efeadf 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -769,7 +769,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam if (contact->type != CLCIT_CONTACT) break; contact->flags ^= CONTACTF_CHECKED; - cli.pfnRecalculateGroupCheckboxes(hwnd, dat); + Clist_RecalculateGroupCheckboxes(dat); cli.pfnInvalidateRect(hwnd, nullptr, FALSE); nm.hdr.code = CLN_CHECKCHANGED; nm.hdr.hwndFrom = hwnd; @@ -932,7 +932,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam contact->flags ^= CONTACTF_CHECKED; if (contact->type == CLCIT_GROUP) Clist_SetGroupChildCheckboxes(contact->group, contact->flags & CONTACTF_CHECKED); - cli.pfnRecalculateGroupCheckboxes(hwnd, dat); + Clist_RecalculateGroupCheckboxes(dat); cli.pfnInvalidateRect(hwnd, nullptr, FALSE); nm.hdr.code = CLN_CHECKCHANGED; nm.hdr.hwndFrom = hwnd; diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index f1b7907630..c777aa3e25 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -95,7 +95,6 @@ void fnNotifyNewContact(HWND hwnd, MCONTACT hContact); void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour); void fnGetFontSetting(int i, LOGFONT *lf, COLORREF *colour); void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst); -void fnRecalculateGroupCheckboxes(HWND hwnd, struct ClcData *dat); void fnSetContactCheckboxes(ClcContact *cc, int checked); DWORD fnGetDefaultExStyle(void); diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index beb352ea49..079a7bc72c 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -714,7 +714,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat) } dat->bLockScrollbar = false; - cli.pfnRecalculateGroupCheckboxes(hwnd, dat); + Clist_RecalculateGroupCheckboxes(dat); cli.pfnRecalcScrollBar(hwnd, dat); diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp index 8957ead116..892cc014b7 100644 --- a/src/mir_app/src/clcmsgs.cpp +++ b/src/mir_app/src/clcmsgs.cpp @@ -325,7 +325,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar contact->flags |= CONTACTF_CHECKED; else contact->flags &= ~CONTACTF_CHECKED; - cli.pfnRecalculateGroupCheckboxes(hwnd, dat); + Clist_RecalculateGroupCheckboxes(dat); cli.pfnInvalidateRect(hwnd, nullptr, FALSE); break; diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 1fb3d86afa..8c13cfea77 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -795,7 +795,7 @@ void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst) #define GSIF_ALLCHECKED 0x40000000 #define GSIF_INDEXMASK 0x3FFFFFFF -void fnRecalculateGroupCheckboxes(HWND, ClcData *dat) +MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat) { ClcGroup *group = &dat->list; group->scanIndex = GSIF_ALLCHECKED; diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 7d5c20a28b..0da53aa5bd 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -114,7 +114,6 @@ void InitClistCore() cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting; cli.pfnGetFontSetting = fnGetFontSetting; cli.pfnLoadClcOptions = fnLoadClcOptions; - cli.pfnRecalculateGroupCheckboxes = fnRecalculateGroupCheckboxes; cli.pfnGetRowBottomY = fnGetRowBottomY; cli.pfnGetRowHeight = fnGetRowHeight; cli.pfnGetRowTopY = fnGetRowTopY; diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 7379c365b3..2812065996 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -559,3 +559,4 @@ Clist_GetCacheEntry @578 Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 Clist_SetGroupChildCheckboxes @581 +Clist_RecalculateGroupCheckboxes @582 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 35eea0a34a..c0b4f1bd1a 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -559,3 +559,4 @@ Clist_GetCacheEntry @578 Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 Clist_SetGroupChildCheckboxes @581 +Clist_RecalculateGroupCheckboxes @582 -- cgit v1.2.3