From 3f9882178018afbe9aaaba1f4461f3fc75493260 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 15 Jun 2015 14:23:02 +0000 Subject: MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ModernOpt/src/modernopt.cpp | 14 +++++++------- plugins/ModernOpt/src/mopt_selector.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/ModernOpt/src') diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index e192bf21be..b661a453ae 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -586,7 +586,7 @@ static int hookModernOpt_Initialize(WPARAM wParam, LPARAM) obj.cbSize = sizeof(obj); obj.dwFlags = MODEROPT_FLG_TCHAR; - obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); + obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); obj.hInstance = hInst; obj.iSection = MODERNOPT_PAGE_HOME; @@ -607,22 +607,22 @@ static int hookModernOpt_Initialize(WPARAM wParam, LPARAM) CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); obj.iType = MODERNOPT_TYPE_IGNOREOBJECT; - obj.hIcon = LoadSkinnedIcon(SKINICON_EVENT_FILE); + obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE); obj.lptzSubsection = _T("Files"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); - obj.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); + obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); obj.lptzSubsection = _T("Messages"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); - obj.hIcon = LoadSkinnedIcon(SKINICON_EVENT_URL); + obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_URL); obj.lptzSubsection = _T("URL events"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); - obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_TYPING); + obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING); obj.lptzSubsection = _T("Typing notifications"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); - obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_ADDCONTACT); + obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_ADDCONTACT); obj.lptzSubsection = _T("Added notifications"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); - obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); + obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA); obj.lptzSubsection = _T("Auth requests"); CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj); diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 994ba7489a..2b49e1ddf8 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -311,12 +311,12 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara if (sd->active && !mir_tstrcmp(sd->active, dat->filename)) { DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2, - LoadSkinnedIcon(SKINICON_OTHER_EMPTYBLOB), + Skin_LoadIcon(SKINICON_OTHER_EMPTYBLOB), cxIcon, cyIcon, 0, NULL, DI_NORMAL); } else { DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2, - LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT), + Skin_LoadIcon(SKINICON_OTHER_SMALLDOT), cxIcon, cyIcon, 0, NULL, DI_NORMAL); } lps->rcItem.left += cxIcon; -- cgit v1.2.3