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/BasicHistory/src/BasicHistory.cpp | 8 ++++---- plugins/BasicHistory/src/EventList.cpp | 2 +- plugins/BasicHistory/src/HistoryWindow.cpp | 14 +++++++------- plugins/BasicHistory/src/Scheduler.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index d38915caec..b77e6cdc18 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -90,7 +90,7 @@ int ToolbarModuleLoaded(WPARAM wParam,LPARAM lParam) ttb.pszService = MS_HISTORY_SHOWCONTACTHISTORY; ttb.name = ttb.pszTooltipUp = LPGEN("Open History"); ttb.dwFlags = TTBBF_SHOWTOOLTIP; - ttb.hIconHandleUp = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); + ttb.hIconHandleUp = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); hToolbarButton = TopToolbar_AddButton(&ttb); return 0; } @@ -99,7 +99,7 @@ void InitMenuItems() { CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 1000090000; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); + mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); mi.pszName = LPGEN("View &History"); mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; hContactMenu = Menu_AddContactMenuItem(&mi); @@ -109,7 +109,7 @@ void InitMenuItems() Menu_AddMainMenuItem(&mi); mi.position = 1000090001; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); + mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); mi.pszName = LPGEN("Delete All User History"); mi.pszService = MS_HISTORY_DELETEALLCONTACTHISTORY; hDeleteContactMenu = Menu_AddContactMenuItem(&mi); @@ -124,7 +124,7 @@ void InitTaskMenuItems() if (hTaskMainMenu == NULL) { mi.position = 500060005; mi.flags = CMIF_ROOTPOPUP; - mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY); + mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); mi.pszName = LPGEN("Execute history task"); hTaskMainMenu = Menu_AddMainMenuItem(&mi); } diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 786b30c178..6dcb35a69d 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -614,7 +614,7 @@ HICON EventList::GetEventCoreIcon(const EventIndex& ev) return NULL; HICON ico = (HICON)CallService(MS_DB_EVENT_GETICON, LR_SHARED, (LPARAM)&gdbei); - HICON icoMsg = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); + HICON icoMsg = Skin_LoadIcon(SKINICON_EVENT_MESSAGE); if (icoMsg == ico) return NULL; diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 2b3a9bd1b4..e01294de40 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -1103,8 +1103,8 @@ void HistoryWindow::Initialise() ResetCList(hWnd); RestorePos(); - SendMessage(hWnd, WM_SETICON, ICON_BIG, ( LPARAM )LoadSkinnedIconBig( SKINICON_OTHER_HISTORY )); - SendMessage(hWnd, WM_SETICON, ICON_SMALL, ( LPARAM )LoadSkinnedIcon( SKINICON_OTHER_HISTORY )); + SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_HISTORY, true)); + SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_HISTORY)); SendMessage(editWindow,EM_AUTOURLDETECT,TRUE,0); SendMessage(editWindow,EM_SETEVENTMASK,0,ENM_LINK | ENM_SELCHANGE | ENM_KEYEVENTS | ENM_MOUSEEVENTS); SendMessage(editWindow,EM_SETEDITSTYLE,SES_EXTENDBACKCOLOR,SES_EXTENDBACKCOLOR); @@ -1122,13 +1122,13 @@ void HistoryWindow::Initialise() } int id = iconsNum; - eventIcons[id] = LoadSkinnedIcon(SKINICON_EVENT_FILE); + eventIcons[id] = Skin_LoadIcon(SKINICON_EVENT_FILE); ImageList_AddIcon(himlSmall, eventIcons[id]); - eventIcons[++id] = LoadSkinnedIcon(SKINICON_EVENT_URL); + eventIcons[++id] = Skin_LoadIcon(SKINICON_EVENT_URL); ImageList_AddIcon(himlSmall, eventIcons[id]); - eventIcons[++id] = LoadSkinnedIcon(SKINICON_OTHER_WINDOWS); + eventIcons[++id] = Skin_LoadIcon(SKINICON_OTHER_WINDOWS); ImageList_AddIcon(himlSmall, eventIcons[id]); if ((isGroupImages = Options::instance->groupShowEvents) != false) @@ -1161,9 +1161,9 @@ void HistoryWindow::Initialise() ImageList_AddIcon(himlButtons, findNextIco); findPrevIco = LoadIconEx(IDI_FINDPREV); ImageList_AddIcon(himlButtons, findPrevIco); - configIco = LoadSkinnedIcon(SKINICON_OTHER_OPTIONS); + configIco = Skin_LoadIcon(SKINICON_OTHER_OPTIONS); ImageList_AddIcon(himlButtons, configIco); - deleteIco = LoadSkinnedIcon(SKINICON_OTHER_DELETE); + deleteIco = Skin_LoadIcon(SKINICON_OTHER_DELETE); ImageList_AddIcon(himlButtons, deleteIco); // Set the image list. diff --git a/plugins/BasicHistory/src/Scheduler.cpp b/plugins/BasicHistory/src/Scheduler.cpp index c44922fb91..fa833a46c5 100644 --- a/plugins/BasicHistory/src/Scheduler.cpp +++ b/plugins/BasicHistory/src/Scheduler.cpp @@ -72,7 +72,7 @@ void InitScheduler() POPUPCLASS test = { sizeof(test) }; test.flags = PCF_TCHAR; - test.hIcon = LoadSkinnedIcon(SKINICON_OTHER_HISTORY); + test.hIcon = Skin_LoadIcon(SKINICON_OTHER_HISTORY); test.iSeconds = 10; test.ptszDescription = TranslateT("History task"); test.pszName = MODULE; @@ -1302,7 +1302,7 @@ void DoError(const TaskOptions& to, const std::wstring _error) ShowClassPopupT(MODULE, msg, (wchar_t*)_error.c_str()); else if ( ServiceExists(MS_POPUP_ADDPOPUPT)) { POPUPDATAT ppd = {0}; - ppd.lchIcon = LoadSkinnedIcon(SKINICON_OTHER_HISTORY); + ppd.lchIcon = Skin_LoadIcon(SKINICON_OTHER_HISTORY); _tcscpy_s(ppd.lptzContactName, msg); _tcscpy_s(ppd.lptzText, _error.c_str()); CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0); -- cgit v1.2.3