From cf9de21af3073e29cb7b149fbd8427241de70729 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
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/Tox/src/tox_contacts.cpp | 2 +-
protocols/Tox/src/tox_options.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'protocols/Tox')
diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp
index fa6b05a7c2..4c2f582e41 100644
--- a/protocols/Tox/src/tox_contacts.cpp
+++ b/protocols/Tox/src/tox_contacts.cpp
@@ -401,7 +401,7 @@ int CToxProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
odp.flags = ODPF_UNICODE | ODPF_DONTTRANSLATE;
odp.hInstance = g_hInstance;
odp.dwInitParam = (LPARAM)this;
- odp.pwszTitle = m_tszUserName;
+ odp.szTitle.w = m_tszUserName;
odp.pfnDlgProc = UserInfoProc;
odp.position = -2000000000;
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 271df96825..8a865f58fa 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -680,19 +680,19 @@ void CToxOptionsNodeList::OnApply()
int CToxProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pwszTitle = m_tszUserName;
+ odp.szTitle.w = m_tszUserName;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
- odp.pwszGroup = LPGENW("Network");
+ odp.szGroup.w = LPGENW("Network");
- odp.pwszTab = LPGENW("Account");
+ odp.szTab.w = LPGENW("Account");
odp.pDialog = CToxOptionsMain::CreateOptionsPage(this);
Options_AddPage(wParam, &odp);
- /*odp.pwszTab = LPGENW("Multimedia");
+ /*odp.szTab.w = LPGENW("Multimedia");
odp.pDialog = CToxOptionsMultimedia::CreateOptionsPage(this);
Options_AddPage(wParam, &odp);*/
- odp.pwszTab = LPGENW("Nodes");
+ odp.szTab.w = LPGENW("Nodes");
odp.pDialog = CToxOptionsNodeList::CreateOptionsPage(this);
Options_AddPage(wParam, &odp);
--
cgit v1.2.3