diff options
author | George Hazan <ghazan@miranda.im> | 2019-04-13 20:22:59 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-04-13 20:22:59 +0300 |
commit | 680873487c4a7987012606119a744e5ca725ad30 (patch) | |
tree | 8e5fbc68a253c3ec44287754c9295670f1ee44c3 /plugins/UserInfoEx/src/dlg_msgbox.cpp | |
parent | 6c4136504c660bf3359e6641362672c4b9502be5 (diff) |
merge with trunk
Diffstat (limited to 'plugins/UserInfoEx/src/dlg_msgbox.cpp')
-rw-r--r-- | plugins/UserInfoEx/src/dlg_msgbox.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 80d049ec74..f335833190 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -107,53 +107,53 @@ static void MakePopupAction(POPUPACTION &pa, int id) switch (id) {
case IDOK:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_OK);
mir_strcpy(pa.lpzTitle, MODULENAME"/Ok");
break;
case IDCLOSE:
case IDCANCEL:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_CLOSE);
mir_strcpy(pa.lpzTitle, MODULENAME"/Cancel");
break;
case IDABORT:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_CLOSE);
mir_strcpy(pa.lpzTitle, MODULENAME"/Abort");
break;
case IDRETRY:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_UPDATE);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_UPDATE);
mir_strcpy(pa.lpzTitle, MODULENAME"/Retry");
break;
case IDIGNORE:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_OK);
mir_strcpy(pa.lpzTitle, MODULENAME"/Ignore");
break;
case IDYES:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_OK);
mir_strcpy(pa.lpzTitle, MODULENAME"/Yes");
break;
case IDNO:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_CLOSE);
mir_strcpy(pa.lpzTitle, MODULENAME"/No");
break;
case IDHELP:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_CLOSE);
mir_strcpy(pa.lpzTitle, MODULENAME"/Help");
break;
case IDALL:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_OK);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_OK);
mir_strcpy(pa.lpzTitle, MODULENAME"/All");
break;
case IDNONE:
- pa.lchIcon = IcoLib_GetIcon(ICO_BTN_CANCEL);
+ pa.lchIcon = g_plugin.getIcon(IDI_BTN_CLOSE);
mir_strcpy(pa.lpzTitle, MODULENAME"/None");
}
}
@@ -198,7 +198,7 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l // set infobar's logo icon
SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON,
- (pMsgBox->hiLogo ? (LPARAM)pMsgBox->hiLogo : (LPARAM)IcoLib_GetIcon(ICO_DLG_DETAILS,TRUE)));
+ (pMsgBox->hiLogo ? (LPARAM)pMsgBox->hiLogo : (LPARAM)g_plugin.getIcon(IDI_DLG_DETAILS, true)));
// enable headerbar
ShowWindow(GetDlgItem(hDlg, TXT_NAME), SW_SHOW);
@@ -667,7 +667,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI MSGBOX mb = { 0 };
mb.cbSize = sizeof(MSGBOX);
mb.hParent = hParent;
- mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN);
+ mb.hiLogo = g_plugin.getIcon(IDI_MAIN);
mb.hiMsg = nullptr;
mb.ptszTitle = TranslateW(pszTitle);
mb.ptszInfoText = TranslateW(pszInfo);
@@ -694,7 +694,7 @@ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...) MSGBOX mb = {0};
mb.cbSize = sizeof(MSGBOX);
mb.hParent = hParent;
- mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN);
+ mb.hiLogo = g_plugin.getIcon(IDI_MAIN);
mb.hiMsg = nullptr;
mb.ptszTitle = tszTitle;
mb.ptszMsg = tszMsg;
|