From 69b001f36e1df9bfc80effd0e7fb5333335c2d87 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Mar 2019 18:26:23 +0300 Subject: Notes & Reminders: - ANSI plugin became Unicode and therefore went under standard project templates; - globals.h renamed to stdafx.h, stdafx.cxx added to a project; - old pascal-style lists replaced with LIST<> templates; - massive code cleaning; - version bump --- src/core/stdmsg/src/msgoptions.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 432691a177..c45ced4938 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -47,11 +47,6 @@ static const fontOptionsList[] = { LPGENW("Other events"), RGB(90, 90, 160), L"Arial", 0, -12}, }; -static BYTE MsgDlgGetFontDefaultCharset(const wchar_t*) -{ - return DEFAULT_CHARSET; -} - bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF * colour) { if (i >= _countof(fontOptionsList)) @@ -88,7 +83,7 @@ bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF * colour) mir_wstrncpy(lf->lfFaceName, wszFontFace, _countof(lf->lfFaceName)); mir_snprintf(str, "SRMFont%dSet", i); - lf->lfCharSet = g_plugin.getByte(str, MsgDlgGetFontDefaultCharset(lf->lfFaceName)); + lf->lfCharSet = g_plugin.getByte(str, DEFAULT_CHARSET); } return true; } @@ -114,7 +109,7 @@ void RegisterSRMMFonts(void) fontid.deffontsettings.size = fontOptionsList[i].defSize; fontid.deffontsettings.style = fontOptionsList[i].defStyle; wcsncpy_s(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, _TRUNCATE); - fontid.deffontsettings.charset = MsgDlgGetFontDefaultCharset(fontOptionsList[i].szDefFace); + fontid.deffontsettings.charset = DEFAULT_CHARSET; wcsncpy_s(fontid.backgroundGroup, LPGENW("Message sessions") L"/" LPGENW("Message log"), _TRUNCATE); wcsncpy_s(fontid.backgroundName, LPGENW("Background"), _TRUNCATE); g_plugin.addFont(&fontid); -- cgit v1.2.3