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 --- protocols/IRCG/src/options.cpp | 12 ++++++------ protocols/IRCG/src/userinfo.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/IRCG/src') diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 20a7899faf..4037a5e288 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1633,23 +1633,23 @@ void CIgnorePrefsDlg::UpdateList() int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = new CConnectPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("DCC and CTCP"); + odp.szTab.w = LPGENW("DCC and CTCP"); odp.pDialog = new CCtcpPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Advanced"); + odp.szTab.w = LPGENW("Advanced"); odp.pDialog = new COtherPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Ignore"); + odp.szTab.w = LPGENW("Ignore"); odp.pDialog = new CIgnorePrefsDlg(this); Options_AddPage(wParam, &odp); return 0; diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index 68b3705a5f..5b27200d1a 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -210,14 +210,14 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_DONTTRANSLATE; - odp.pszTitle = m_szModuleName; + odp.szTitle.a = m_szModuleName; odp.hIcon = NULL; odp.dwInitParam = (LPARAM)this; odp.hInstance = hInst; odp.position = -1900000000; odp.pfnDlgProc = UserDetailsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO); - odp.pszTitle = m_szModuleName; + odp.szTitle.a = m_szModuleName; UserInfo_AddPage(wParam, &odp); return 0; } -- cgit v1.2.3