From cf9de21af3073e29cb7b149fbd8427241de70729 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 Oct 2016 16:18:50 +0300 Subject: - old useless helpers removed from the Options module; - mir_app functions introduced instead of them; - OPENOPTIONSDIALOG structure removed from m_options.h --- plugins/AutoShutdown/src/options.cpp | 6 +++--- plugins/AutoShutdown/src/settingsdlg.cpp | 11 ++--------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'plugins/AutoShutdown/src') diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index 267959c1d6..7a9f2001fd 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -110,9 +110,9 @@ static int ShutdownOptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHUTDOWN); odp.position = 900000002; - odp.pwszGroup = LPGENW("Events"); /* autotranslated */ - odp.pwszTitle = LPGENW("Automatic shutdown"); /* autotranslated */ - odp.pwszTab = LPGENW("Automatic shutdown"); /* autotranslated, can be made a tab */ + odp.szGroup.w = LPGENW("Events"); /* autotranslated */ + odp.szTitle.w = LPGENW("Automatic shutdown"); /* autotranslated */ + odp.szTab.w = LPGENW("Automatic shutdown"); /* autotranslated, can be made a tab */ odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pfnDlgProc = ShutdownOptDlgProc; Options_AddPage(wParam, &odp); diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index ce4504eb4d..58e3911e07 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -331,15 +331,8 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case IDC_URL_IDLE: - { - OPENOPTIONSDIALOG ood; - ood.cbSize = sizeof(ood); - ood.pszGroup = "Status"; /* autotranslated */ - ood.pszPage = "Idle"; /* autotranslated */ - ood.pszTab = NULL; - Options_Open(&ood); - return TRUE; - } + Options_Open(L"Status", L"Idle"); + return TRUE; case IDC_COMBO_SHUTDOWNTYPE: if (HIWORD(wParam) == CBN_SELCHANGE) -- cgit v1.2.3