diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-06 19:34:12 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-06 19:34:12 +0300 |
| commit | 71bdb2f1b65f1649dcd707eaf32d590eb253495c (patch) | |
| tree | 43fc6f121a6ffc53a2f177f6cc3c155cac38f654 /src | |
| parent | 1d0e5e12761293b41d0dede5276e198bb91d1f2e (diff) | |
CLIST_INTERFACE::pfnGetFontSetting => Clist_GetFontSetting
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdclist/src/clcfonts.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdclist/src/clcopts.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clc.h | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clcutils.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clistcore.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 |
7 files changed, 6 insertions, 6 deletions
diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index d00c89df0a..c8f06365f1 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.cpp @@ -59,7 +59,7 @@ void RegisterCListFonts() HDC hdc = GetDC(nullptr);
for (int i = 0; i < _countof(clistFontDescr); i++) {
LOGFONT lf;
- pcli->pfnGetFontSetting(i, &lf, &fontid.deffontsettings.colour);
+ Clist_GetFontSetting(i, &lf, &fontid.deffontsettings.colour);
lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72);
wcsncpy_s(fontid.deffontsettings.szFace, lf.lfFaceName, _TRUNCATE);
@@ -121,7 +121,7 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) DeleteObject(dat->fontInfo[i].hFont);
LOGFONT lf;
- pcli->pfnGetFontSetting(i, &lf, &dat->fontInfo[i].colour);
+ Clist_GetFontSetting(i, &lf, &dat->fontInfo[i].colour);
lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72);
dat->fontInfo[i].hFont = CreateFontIndirect(&lf);
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 932e546e52..453a2b6267 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -124,7 +124,7 @@ static LONG CalcMinRowHeight() for (int i = 0; i < FONTID_LAST; i++) {
LOGFONT lf;
COLORREF color;
- pcli->pfnGetFontSetting(i, &lf, &color);
+ Clist_GetFontSetting(i, &lf, &color);
lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72);
HFONT hFont = CreateFontIndirect(&lf);
hFont = (HFONT)SelectObject(hdc, hFont);
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index c777aa3e25..ebdd0b1dcf 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -93,7 +93,6 @@ int fnIsHiddenMode(struct ClcData *dat, int status); void fnHideInfoTip(HWND hwnd, struct ClcData *dat);
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 fnSetContactCheckboxes(ClcContact *cc, int checked);
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 8c13cfea77..e0ecf94e42 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -698,7 +698,7 @@ void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour) }
}
-void fnGetFontSetting(int i, LOGFONT *lf, COLORREF *colour)
+MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour)
{
cli.pfnGetDefaultFontSetting(i, lf, colour);
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 0da53aa5bd..a4828244f5 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -112,7 +112,6 @@ void InitClistCore() cli.pfnNotifyNewContact = fnNotifyNewContact;
cli.pfnGetDefaultExStyle = fnGetDefaultExStyle;
cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;
- cli.pfnGetFontSetting = fnGetFontSetting;
cli.pfnLoadClcOptions = fnLoadClcOptions;
cli.pfnGetRowBottomY = fnGetRowBottomY;
cli.pfnGetRowHeight = fnGetRowHeight;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 2812065996..9aae4506fa 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -560,3 +560,4 @@ Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580
Clist_SetGroupChildCheckboxes @581
Clist_RecalculateGroupCheckboxes @582
+Clist_GetFontSetting @583
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index c0b4f1bd1a..69d4f4aa02 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -560,3 +560,4 @@ Clist_EventsProcessTrayDoubleClick @579 Clist_InvalidateItem @580
Clist_SetGroupChildCheckboxes @581
Clist_RecalculateGroupCheckboxes @582
+Clist_GetFontSetting @583
|