From 124f58006ce473de9dc391c7ced1f12875df080f Mon Sep 17 00:00:00 2001
From: Alexander Lantsev <aunsane@gmail.com>
Date: Mon, 13 Apr 2015 15:12:46 +0000
Subject: dialog fix for SkypeWeb & Tox

git-svn-id: http://svn.miranda-ng.org/main/trunk@12788 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tox/src/tox_options.cpp | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

(limited to 'protocols/Tox/src/tox_options.cpp')

diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 25443fb59e..49860ff5bd 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 
-CToxOptionsMain::CToxOptionsMain(CToxProto *proto, int idDialog, HWND hwndParent)
+CToxOptionsMain::CToxOptionsMain(CToxProto *proto, int idDialog)
 	: CToxDlgBase(proto, idDialog, false),
 	m_toxAddress(this, IDC_TOXID), m_toxAddressCopy(this, IDC_CLIPBOARD),
 	m_profileCreate(this, IDC_PROFILE_NEW), m_profileImport(this, IDC_PROFILE_IMPORT),
@@ -8,7 +8,6 @@ CToxOptionsMain::CToxOptionsMain(CToxProto *proto, int idDialog, HWND hwndParent
 	m_password(this, IDC_PASSWORD), m_group(this, IDC_GROUP),
 	m_enableUdp(this, IDC_ENABLE_UDP), m_enableIPv6(this, IDC_ENABLE_IPV6)
 {
-	SetParent(hwndParent);
 
 	CreateLink(m_toxAddress, TOX_SETTINGS_ID, _T(""));
 	CreateLink(m_nickname, "Nick", _T(""));
@@ -148,6 +147,33 @@ void CToxOptionsMain::OnApply()
 
 /////////////////////////////////////////////////////////////////////////////////
 
+CToxOptionsMultimedia::CToxOptionsMultimedia(CToxProto *proto)
+	: CToxDlgBase(proto, IDD_OPTIONS_AV, false),
+	m_audioInput(this, IDC_AUDIOINPUT), m_audioOutput(this, IDC_AUDIOOUTPUT)
+{
+	m_audioInput.OnChange = Callback(this, &CToxOptionsMultimedia::AudioInput_OnClick);
+	m_audioOutput.OnChange = Callback(this, &CToxOptionsMultimedia::AudioOutput_OnClick);
+}
+
+void CToxOptionsMultimedia::OnInitDialog()
+{
+	CToxDlgBase::OnInitDialog();
+}
+
+void CToxOptionsMultimedia::AudioInput_OnClick(CCtrlData*)
+{
+}
+
+void CToxOptionsMultimedia::AudioOutput_OnClick(CCtrlData*)
+{
+}
+
+void CToxOptionsMultimedia::OnApply()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+
 CToxNodeEditor::CToxNodeEditor(int iItem, CCtrlListView *m_nodes)
 	: CSuper(g_hInstance, IDD_NODE_EDITOR),
 	m_ipv4(this, IDC_IPV4), m_ipv6(this, IDC_IPV6),
@@ -482,11 +508,16 @@ int CToxProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.ptszGroup = LPGENT("Network");
 
 	odp.ptszTab = LPGENT("Account");
-	odp.pDialog = new CToxOptionsMain(this, IDD_OPTIONS_MAIN);
+	odp.pDialog = CToxOptionsMain::CreateOptionsPage(this);
+	Options_AddPage(wParam, &odp);
+
+	odp.ptszTab = LPGENT("Multimedia");
+	odp.pDialog = CToxOptionsMultimedia::CreateOptionsPage(this);
 	Options_AddPage(wParam, &odp);
 
 	odp.ptszTab = LPGENT("Nodes");
-	odp.pDialog = new CToxOptionsNodeList(this);
+	odp.pDialog = CToxOptionsNodeList::CreateOptionsPage(this);
 	Options_AddPage(wParam, &odp);
+
 	return 0;
 }
-- 
cgit v1.2.3