From 0976190894d653d5062f8ef6befabf46218f2d24 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 3 Oct 2016 16:48:12 +0000 Subject: - inlined helpers for fonts, colors & effects creation replaced with functions; - services for getting fonts, colors & effects removed; - some memory corruptions removed git-svn-id: http://svn.miranda-ng.org/main/trunk@17347 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_frame.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'protocols/JabberG/src/jabber_frame.cpp') diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp index be116dc5ae..acf6098cde 100644 --- a/protocols/JabberG/src/jabber_frame.cpp +++ b/protocols/JabberG/src/jabber_frame.cpp @@ -239,25 +239,15 @@ void CJabberInfoFrame::Update() void CJabberInfoFrame::ReloadFonts() { LOGFONT lfFont; - - FontIDW fontid = {0}; - fontid.cbSize = sizeof(fontid); - wcsncpy_s(fontid.group, L"Jabber", _TRUNCATE); - wcsncpy_s(fontid.name, L"Frame title", _TRUNCATE); - m_clTitle = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lfFont); + m_clTitle = Font_GetW(L"Jabber", L"Frame title", &lfFont); DeleteObject(m_hfntTitle); m_hfntTitle = CreateFontIndirect(&lfFont); - wcsncpy_s(fontid.name, L"Frame text", _TRUNCATE); - m_clText = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lfFont); + m_clText = Font_GetW(L"Jabber", L"Frame text",&lfFont); DeleteObject(m_hfntText); m_hfntText = CreateFontIndirect(&lfFont); - ColourIDW colourid = {0}; - colourid.cbSize = sizeof(colourid); - wcsncpy_s(colourid.group, L"Jabber", _TRUNCATE); - wcsncpy_s(colourid.name, L"Background", _TRUNCATE); - m_clBack = CallService(MS_COLOUR_GETW, (WPARAM)&colourid, 0); + m_clBack = Colour_GetW(L"Jabber", L"Background"); UpdateSize(); } -- cgit v1.2.3