From 103ed2a6565ebd312205af9543cb195ddf39be2a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 12 Apr 2019 18:07:24 +0300 Subject: UserInfoEx: old icolib management replaced with new one --- plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 12 ++++++------ plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp | 6 +++--- plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import') diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 689e72c564..9ef607b19c 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -162,10 +162,10 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar // set icons { const ICONCTRL idIcon[] = { - { ICO_DLG_EXPORT, WM_SETICON, NULL }, - { ICO_DLG_EXPORT, STM_SETIMAGE, ICO_DLGLOGO }, - { ICO_BTN_EXPORT, BM_SETIMAGE, IDOK }, - { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } + { IDI_EXPORT, WM_SETICON, NULL }, + { IDI_EXPORT, STM_SETIMAGE, ICO_DLGLOGO }, + { IDI_EXPORT, BM_SETIMAGE, IDOK }, + { IDI_BTN_CLOSE, BM_SETIMAGE, IDCANCEL } }; const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); @@ -181,8 +181,8 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImages); HICON hIcon; - bImagesLoaded = ((((hIcon = IcoLib_GetIcon(ICO_LST_MODULES)) != nullptr) && 0 == ImageList_AddIcon(hImages, hIcon)) - && (((hIcon = IcoLib_GetIcon(ICO_LST_FOLDER)) != nullptr) && 1 == ImageList_AddIcon(hImages, hIcon))); + bImagesLoaded = ((((hIcon = g_plugin.getIcon(IDI_LST_MODULES)) != nullptr) && 0 == ImageList_AddIcon(hImages, hIcon)) + && (((hIcon = g_plugin.getIcon(IDI_LST_FOLDER)) != nullptr) && 1 == ImageList_AddIcon(hImages, hIcon))); } } } diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp index 8e4ca959ae..3535f8d261 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp @@ -38,9 +38,9 @@ INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar case WM_INITDIALOG: { const ICONCTRL idIcon[] = { - { ICO_DLG_IMPORT, WM_SETICON, NULL }, - { ICO_DLG_IMPORT, STM_SETIMAGE, ICO_DLGLOGO }, - { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } + { IDI_IMPORT, WM_SETICON, NULL }, + { IDI_IMPORT, STM_SETIMAGE, ICO_DLGLOGO }, + { IDI_BTN_CLOSE, BM_SETIMAGE, IDCANCEL } }; const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 67344160c0..8dd883c6c8 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -30,10 +30,10 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM TranslateDialogDefault(hDlg); { const ICONCTRL idIcon[] = { - { ICO_DLG_EXPORT, WM_SETICON, NULL }, - { ICO_DLG_EXPORT, STM_SETIMAGE, ICO_DLGLOGO }, - { ICO_BTN_EXPORT, BM_SETIMAGE, IDOK }, - { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } + { IDI_EXPORT, WM_SETICON, NULL }, + { IDI_EXPORT, STM_SETIMAGE, ICO_DLGLOGO }, + { IDI_EXPORT, BM_SETIMAGE, IDOK }, + { IDI_BTN_CLOSE, BM_SETIMAGE, IDCANCEL } }; const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); -- cgit v1.2.3