dialog fix for SkypeWeb & Tox

git-svn-id: http://svn.miranda-ng.org/main/trunk@12788 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 8 insertions, 13 deletions

diff --git a/protocols/SkypeWeb/src/skype_dialogs.h b/protocols/SkypeWeb/src/skype_dialogs.h
index 2f9312993e..b573a2d1c3 100644
--- a/protocols/SkypeWeb/src/skype_dialogs.h
+++ b/protocols/SkypeWeb/src/skype_dialogs.h
@@ -49,7 +49,7 @@ protected:
 

 public:

 	CSkypePasswordEditor(CSkypeProto *proto) :

-		CSkypeDlgBase(proto, IDD_PASSWORD_EDITOR, NULL, false), m_ok(this, IDOK),

+		CSkypeDlgBase(proto, IDD_PASSWORD_EDITOR, false), m_ok(this, IDOK),

 		m_password(this, IDC_PASSWORD), m_savePermanently(this, IDC_SAVEPERMANENTLY)

 	{

 		m_ok.OnClick = Callback(this, &CSkypePasswordEditor::OnOk);

diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp
index 82f12ae358..d7e0396113 100644
--- a/protocols/SkypeWeb/src/skype_options.cpp
+++ b/protocols/SkypeWeb/src/skype_options.cpp
@@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "common.h"

 

-CSkypeOptionsMain::CSkypeOptionsMain(CSkypeProto *proto, int idDialog, HWND hwndParent)

-	: CSkypeDlgBase(proto, idDialog, hwndParent, false),

+CSkypeOptionsMain::CSkypeOptionsMain(CSkypeProto *proto, int idDialog)

+	: CSkypeDlgBase(proto, idDialog, false),

 	m_skypename(this, IDC_SKYPENAME),

 	m_password(this, IDC_PASSWORD),

 	m_group(this, IDC_GROUP),

@@ -59,15 +59,11 @@ int CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance = g_hInstance;

 	odp.pszTitle = title;

-	odp.flags = ODPF_BOLDGROUPS | ODPF_DONTTRANSLATE;

+	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.pszGroup = LPGEN("Network");

 

 	odp.pszTab = LPGEN("Account");

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_MAIN);

-	odp.pfnDlgProc = CSkypeOptionsMain::DynamicDlgProc;

-	odp.dwInitParam = (LPARAM)&SkypeMainOptionsParam;

-	SkypeMainOptionsParam.create = CSkypeOptionsMain::CreateOptionsPage;

-	SkypeMainOptionsParam.param = this;

+	odp.pDialog = CSkypeOptionsMain::CreateOptionsPage(this);

 	Options_AddPage(wParam, &odp);

 

 	mir_free(title);

diff --git a/protocols/SkypeWeb/src/skype_options.h b/protocols/SkypeWeb/src/skype_options.h
index 4b5c785337..c593dc1856 100644
--- a/protocols/SkypeWeb/src/skype_options.h
+++ b/protocols/SkypeWeb/src/skype_options.h
@@ -28,7 +28,7 @@ private:
 	CCtrlCheck m_localtime;

 

 protected:

-	CSkypeOptionsMain(CSkypeProto *proto, int idDialog, HWND hwndParent = NULL);

+	CSkypeOptionsMain(CSkypeProto *proto, int idDialog);

 

 	void OnInitDialog();

 	void OnApply();

@@ -36,7 +36,8 @@ protected:
 public:

 	static CDlgBase *CreateAccountManagerPage(void *param, HWND owner)

 	{

-		CSkypeOptionsMain *page = new CSkypeOptionsMain((CSkypeProto*)param, IDD_ACCOUNT_MANAGER, owner);

+		CSkypeOptionsMain *page = new CSkypeOptionsMain((CSkypeProto*)param, IDD_ACCOUNT_MANAGER);

+		page->SetParent(owner);

 		page->Show();

 		return page;

 	}

diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 180bfdc8f2..adbde10032 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -126,8 +126,6 @@ private:
 	int OnInitStatusMenu();

 

 	// options

-	CSkypeDlgBase::CreateParam SkypeMainOptionsParam;

-

 	int __cdecl OnOptionsInit(WPARAM wParam, LPARAM lParam);

 

 	// login