From aea29a34173d692e237b1c74de8d10c76b4dfd0d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Oct 2016 17:45:38 +0300 Subject: OPTIONSDIALOGPAGE::hIcon - also unused --- include/delphi/m_options.inc | 1 - include/m_options.h | 1 - plugins/AVS/src/options.cpp | 1 - plugins/Quotes/src/Forex.cpp | 1 - plugins/Quotes/src/QuoteInfoDlg.cpp | 1 - plugins/UserInfoEx/src/classPsTreeItem.cpp | 7 ++----- plugins/UserInfoEx/src/dlg_propsheet.cpp | 18 +++++++++--------- protocols/IRCG/src/userinfo.cpp | 1 - src/core/stduserinfo/src/userinfo.cpp | 1 - 9 files changed, 11 insertions(+), 21 deletions(-) diff --git a/include/delphi/m_options.inc b/include/delphi/m_options.inc index c21e060828..55d2411654 100644 --- a/include/delphi/m_options.inc +++ b/include/delphi/m_options.inc @@ -59,7 +59,6 @@ type pfnDlgProc :pointer; pszTemplate :PAnsiChar; hInstance :THANDLE; - hIcon :HICON; // hLangpack :int; flags :dword; // dwInitParam :LPARAM; // a value to pass to lParam of WM_INITDIALOG message diff --git a/include/m_options.h b/include/m_options.h index 5457c8e9a8..241b865ca5 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -64,7 +64,6 @@ struct OPTIONSDIALOGPAGE DLGPROC pfnDlgProc; char *pszTemplate; HINSTANCE hInstance; - HICON hIcon; int hLangpack; DWORD flags; diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 558426105a..cd5fc11f54 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -1102,7 +1102,6 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP int OnDetailsInit(WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.hIcon = g_hIcon; odp.hInstance = g_hInst; odp.szTitle.a = LPGEN("Avatar"); diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 0b4adb1ce7..a33c542419 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -270,7 +270,6 @@ int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/) odp.hInstance = g_hInstance; odp.szTitle.w = _T(QUOTES_PROTOCOL_NAME); odp.szGroup.w = LPGENW("Network"); - odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN); odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE; std::for_each(rapProviders.begin(), rapProviders.end(), boost::bind(&IQuotesProvider::ShowPropertyPage, _1, wp, boost::ref(odp))); diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index 5e3d355590..14e2cd8ae7 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -109,7 +109,6 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp, LPARAM lp) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; - odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN); odp.pfnDlgProc = QuoteInfoDlgProc; odp.position = -2000000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO); diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 99e3f70f29..b006a05789 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -332,7 +332,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn // icon library exists? if (sid.defaultFile.w) - sid.iDefaultIndex = (INT_PTR)odp->hIcon; + sid.iDefaultIndex = odp->dwInitParam; // no valid icon library else { bNeedFree = true; @@ -342,10 +342,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn } // default icon is delivered by the page to add else { - if (odp->hIcon) - sid.hDefaultIcon = odp->hIcon; - else - sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL), bNeedFree = true; + sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL), bNeedFree = true; sid.iDefaultIndex = -1; } } diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 83f6400fb3..6e300df305 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -436,56 +436,56 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_GENERAL); odp.position = 0x8000000; odp.pfnDlgProc = PSPProcGeneral; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_GENERAL); + odp.dwInitParam = ICONINDEX(IDI_TREE_GENERAL); mir_wstrncpy(szTitle + ofs, LPGENW("General"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS); odp.position = 0x8000001; odp.pfnDlgProc = PSPProcContactHome; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS); + odp.dwInitParam = ICONINDEX(IDI_TREE_ADDRESS); mir_wstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Contact (private)"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ORIGIN); odp.position = 0x8000002; odp.pfnDlgProc = PSPProcOrigin; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADVANCED); + odp.dwInitParam = ICONINDEX(IDI_TREE_ADVANCED); mir_wstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Origin"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ANNIVERSARY); odp.position = 0x8000003; odp.pfnDlgProc = PSPProcAnniversary; - odp.hIcon = (HICON)ICONINDEX(IDI_BIRTHDAY); + odp.dwInitParam = ICONINDEX(IDI_BIRTHDAY); mir_wstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Anniversaries"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_COMPANY); odp.position = 0x8000004; odp.pfnDlgProc = PSPProcCompany; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_COMPANY); + odp.dwInitParam = ICONINDEX(IDI_TREE_COMPANY); mir_wstrncpy(szTitle + ofs, LPGENW("Work"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS); odp.position = 0x8000005; odp.pfnDlgProc = PSPProcContactWork; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS); + odp.dwInitParam = ICONINDEX(IDI_TREE_ADDRESS); mir_wstrncpy(szTitle + ofs, LPGENW("Work") L"\\" LPGENW("Contact (work)"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT); odp.position = 0x8000006; odp.pfnDlgProc = PSPProcAbout; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ABOUT); + odp.dwInitParam = ICONINDEX(IDI_TREE_ABOUT); mir_wstrncpy(szTitle + ofs, LPGENW("About"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_PROFILE); odp.position = 0x8000007; odp.pfnDlgProc = PSPProcContactProfile; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_PROFILE); + odp.dwInitParam = ICONINDEX(IDI_TREE_PROFILE); mir_wstrncpy(szTitle + ofs, LPGENW("About") L"\\" LPGENW("Profile"), _countof(szTitle) - ofs); AddPage(wParam, (LPARAM)&odp); return 0; @@ -522,7 +522,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT); odp.position = 0x8000008; odp.pfnDlgProc = PSPProcMyNotes; - odp.hIcon = (HICON)ICONINDEX(IDI_TREE_NOTES); + odp.dwInitParam = ICONINDEX(IDI_TREE_NOTES); AddPage(wParam, (LPARAM)&odp); } } diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index 5b27200d1a..2813f65edc 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -211,7 +211,6 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_DONTTRANSLATE; odp.szTitle.a = m_szModuleName; - odp.hIcon = NULL; odp.dwInitParam = (LPARAM)this; odp.hInstance = hInst; odp.position = -1900000000; diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index 60dbb6d93e..0bf7bd79c0 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -157,7 +157,6 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam) dst->hLangpack = odp->hLangpack; dst->flags = odp->flags; - dst->hIcon = odp->hIcon; dst->dwInitParam = odp->dwInitParam; opi->pageCount++; return 0; -- cgit v1.2.3