From b0ec1e2430b26d00a5d6a1baf49ff80d5a444e37 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 28 Nov 2017 21:09:36 +0300 Subject: OPTIONSDIALOGPAGE::hInstance is useless when pDialog is filled --- protocols/Discord/src/options.cpp | 1 - protocols/VKontakte/src/vk_options.cpp | 2 -- src/core/stdmsg/src/chat_options.cpp | 1 - src/core/stdmsg/src/msgoptions.cpp | 1 - src/mir_app/src/lpopts.cpp | 1 - src/mir_app/src/srmm_toolbar.cpp | 1 - 6 files changed, 7 deletions(-) diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp index 057a9980e3..a929f132f7 100644 --- a/protocols/Discord/src/options.cpp +++ b/protocols/Discord/src/options.cpp @@ -69,7 +69,6 @@ INT_PTR CDiscordProto::SvcCreateAccMgrUI(WPARAM, LPARAM hwndParent) int CDiscordProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.hInstance = g_hInstance; odp.szTitle.w = m_tszUserName; odp.flags = ODPF_UNICODE; odp.szGroup.w = LPGENW("Network"); diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index f79632158d..f6c44f235d 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -73,7 +73,6 @@ void CVkAccMgrForm::OnApply() int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.hInstance = hInst; odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; @@ -103,7 +102,6 @@ int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.position = 5; odp.pDialog = new CVkOptionMenuForm(this); Options_AddPage(wParam, &odp); - return 0; } diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index d907977a32..cf248e67da 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -688,7 +688,6 @@ public: int ChatOptionsInitialize(WPARAM wParam) { OPTIONSDIALOGPAGE odp = {}; - odp.hInstance = g_hInst; odp.flags = ODPF_BOLDGROUPS; odp.szGroup.a = LPGEN("Message sessions"); odp.szTitle.a = LPGEN("Group chats"); diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index d00ca852a3..06536f5cd5 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -624,7 +624,6 @@ static int OptInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = {}; odp.position = 910000000; - odp.hInstance = g_hInst; odp.szTab.a = LPGEN("Messaging"); odp.flags = ODPF_BOLDGROUPS; diff --git a/src/mir_app/src/lpopts.cpp b/src/mir_app/src/lpopts.cpp index 85cb5468a9..2811097104 100644 --- a/src/mir_app/src/lpopts.cpp +++ b/src/mir_app/src/lpopts.cpp @@ -271,7 +271,6 @@ void CLangpackDlg::OnDestroy() int LangpackOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.hInstance = g_hInst; odp.position = -1300000000; odp.szTitle.a = LPGEN("Languages"); odp.szGroup.a = LPGEN("Customize"); diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index 90db284edb..afe9715e04 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -791,7 +791,6 @@ static int SrmmOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 910000000; - odp.hInstance = g_hInst; odp.szGroup.a = LPGEN("Message sessions"); odp.szTitle.a = LPGEN("Toolbar"); odp.flags = ODPF_BOLDGROUPS; -- cgit v1.2.3