From 124f58006ce473de9dc391c7ced1f12875df080f Mon Sep 17 00:00:00 2001 From: Alexander Lantsev 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.h | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) (limited to 'protocols/Tox/src/tox_options.h') diff --git a/protocols/Tox/src/tox_options.h b/protocols/Tox/src/tox_options.h index afda3aee4e..6edc2688e6 100644 --- a/protocols/Tox/src/tox_options.h +++ b/protocols/Tox/src/tox_options.h @@ -30,14 +30,41 @@ protected: void OnApply(); public: - CToxOptionsMain(CToxProto *proto, int idDialog, HWND hwndParent = NULL); + CToxOptionsMain(CToxProto *proto, int idDialog); static CDlgBase *CreateAccountManagerPage(void *param, HWND owner) { - CToxOptionsMain *page = new CToxOptionsMain((CToxProto*)param, IDD_ACCOUNT_MANAGER, owner); + CToxOptionsMain *page = new CToxOptionsMain((CToxProto*)param, IDD_ACCOUNT_MANAGER); + page->SetParent(owner); page->Show(); return page; } + + static CDlgBase *CreateOptionsPage(void *param) { return new CToxOptionsMain((CToxProto*)param, IDD_OPTIONS_MAIN); } +}; + +///////////////////////////////////////////////////////////////////////////////// + +class CToxOptionsMultimedia : public CToxDlgBase +{ +private: + typedef CToxDlgBase CSuper; + + CCtrlCombo m_audioInput; + CCtrlCombo m_audioOutput; + +protected: + void OnInitDialog(); + + void AudioInput_OnClick(CCtrlData*); + void AudioOutput_OnClick(CCtrlData*); + + void OnApply(); + +public: + CToxOptionsMultimedia(CToxProto *proto); + + static CDlgBase *CreateOptionsPage(void *param) { return new CToxOptionsMultimedia((CToxProto*)param); } }; ///////////////////////////////////////////////////////////////////////////////// @@ -92,9 +119,6 @@ private: CCtrlNodeList m_nodes; CCtrlButton m_addNode; -public: - CToxOptionsNodeList(CToxProto *proto); - protected: void OnInitDialog(); void OnApply(); @@ -103,6 +127,11 @@ protected: void OnNodeListDoubleClick(CCtrlBase*); void OnNodeListClick(CCtrlListView::TEventInfo *evt); void OnNodeListKeyDown(CCtrlListView::TEventInfo *evt); + +public: + CToxOptionsNodeList(CToxProto *proto); + + static CDlgBase *CreateOptionsPage(void *param) { return new CToxOptionsNodeList((CToxProto*)param); } }; #endif //_TOX_OPTIONS_H_ \ No newline at end of file -- cgit v1.2.3