From 0637ba6920b7e7b3ef2b8fd8450d90262ac77649 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Apr 2018 19:17:08 +0300 Subject: CLIST_INTERFACE::pfnSetGroupChildCheckboxes => Clist_SetGroupChildCheckboxes --- include/delphi/m_clistint.inc | 2 +- include/m_clistint.h | 6 ++---- libs/win32/mir_app.lib | Bin 150762 -> 151052 bytes libs/win64/mir_app.lib | Bin 146214 -> 146484 bytes plugins/Clist_modern/src/modern_clc.cpp | 2 +- src/mir_app/src/clc.cpp | 2 +- src/mir_app/src/clc.h | 1 - src/mir_app/src/clcutils.cpp | 4 ++-- src/mir_app/src/clistcore.cpp | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 11 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 12cef06989..5079e17b15 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -361,7 +361,7 @@ type pfnGetFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl; pfnLoadClcOptions : procedure (hwnd:HWND; var dat:TClcData; bFirst: int); cdecl; pfnRecalculateGroupCheckboxes : procedure (hwnd:HWND; var dat:TClcData); cdecl; - pfnSetGroupChildCheckboxes : procedure (var group:TClcGroup; checked:int); cdecl; + blablablabla5 : procedure; cdecl; blablablabla4 : procedure; cdecl; pfnGetRowBottomY : function (var dat:TClcData; item:int):int; cdecl; diff --git a/include/m_clistint.h b/include/m_clistint.h index 0dfb893124..7ef1350b13 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_SetGroupChildCheckboxes(ClcGroup *group, int checked); EXTERN_C MIR_APP_DLL(int) Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status); EXTERN_C MIR_APP_DLL(int) Clist_TrayIconDestroy(HWND hwnd); @@ -274,9 +275,6 @@ EXTERN_C MIR_APP_DLL(ClcCacheEntry*) Clist_GetCacheEntry(MCONTACT hContact); // calculates account's index by its position in status bar EXTERN_C MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos); -#define GSMDF_UNTRANSLATED 4 // don't tranlate the result -EXTERN_C MIR_APP_DLL(wchar_t*) Clist_GetStatusModeDescription(int iStatus, int iFlags /*GSMDF_*/); - ///////////////////////////////////////////////////////////////////////////////////////// // CLIST_INTERFACE structure definition @@ -372,7 +370,7 @@ struct CLIST_INTERFACE void (*pfnGetFontSetting)(int i, LOGFONT *lf, COLORREF *colour); void (*pfnLoadClcOptions)(HWND hwnd, ClcData *dat, BOOL bFirst); void (*pfnRecalculateGroupCheckboxes)(HWND hwnd, ClcData *dat); - void (*pfnSetGroupChildCheckboxes)(ClcGroup *group, int checked); + void (*blablablabla5)(); void (*blablablabla4)(); int (*pfnGetRowBottomY)(ClcData *dat, int item); diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 1cc983dd47..e19b391503 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 0a3d15d6cb..19dee28ef0 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 33348b0a71..9d60fbda9f 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -758,7 +758,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP int bNewState = (contact->flags & CONTACTF_CHECKED) == 0; // inversion if (contact->type == CLCIT_GROUP) - pcli->pfnSetGroupChildCheckboxes(contact->group, bNewState); + Clist_SetGroupChildCheckboxes(contact->group, bNewState); else pcli->pfnSetContactCheckboxes(contact, bNewState); pcli->pfnRecalculateGroupCheckboxes(hwnd, dat); diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 4b786cda53..d6be92af35 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -931,7 +931,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam NMCLISTCONTROL nm; contact->flags ^= CONTACTF_CHECKED; if (contact->type == CLCIT_GROUP) - cli.pfnSetGroupChildCheckboxes(contact->group, contact->flags & CONTACTF_CHECKED); + Clist_SetGroupChildCheckboxes(contact->group, contact->flags & CONTACTF_CHECKED); cli.pfnRecalculateGroupCheckboxes(hwnd, dat); cli.pfnInvalidateRect(hwnd, nullptr, FALSE); nm.hdr.code = CLN_CHECKCHANGED; diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 2925629a88..f1b7907630 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -96,7 +96,6 @@ 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 fnSetGroupChildCheckboxes(ClcGroup *group, int checked); void fnSetContactCheckboxes(ClcContact *cc, int checked); DWORD fnGetDefaultExStyle(void); diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 0c04d08279..1fb3d86afa 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -835,11 +835,11 @@ void fnSetContactCheckboxes(ClcContact *cc, int checked) cc->flags &= ~CONTACTF_CHECKED; } -void fnSetGroupChildCheckboxes(ClcGroup *group, int checked) +MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked) { for (auto &cc : group->cl) { if (cc->type == CLCIT_GROUP) { - cli.pfnSetGroupChildCheckboxes(cc->group, checked); + Clist_SetGroupChildCheckboxes(cc->group, checked); cli.pfnSetContactCheckboxes(cc, checked); } else if (cc->type == CLCIT_CONTACT) diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index ea02d17230..7d5c20a28b 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -115,7 +115,6 @@ void InitClistCore() cli.pfnGetFontSetting = fnGetFontSetting; cli.pfnLoadClcOptions = fnLoadClcOptions; cli.pfnRecalculateGroupCheckboxes = fnRecalculateGroupCheckboxes; - cli.pfnSetGroupChildCheckboxes = fnSetGroupChildCheckboxes; 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 674af31044..7379c365b3 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -558,3 +558,4 @@ Clist_GetContactDisplayName @577 Clist_GetCacheEntry @578 Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 +Clist_SetGroupChildCheckboxes @581 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 8671a4d445..35eea0a34a 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -558,3 +558,4 @@ Clist_GetContactDisplayName @577 Clist_GetCacheEntry @578 Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580 +Clist_SetGroupChildCheckboxes @581 -- cgit v1.2.3