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

---
 plugins/Clist_modern/src/modern_clcopts.cpp   | 10 +++++-----
 plugins/Clist_modern/src/modern_clistopts.cpp |  6 +++---
 plugins/Clist_modern/src/modern_skinopt.cpp   |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/Clist_modern')

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index a7ab4ba676..a8b97612bc 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -1817,13 +1817,13 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = g_hInst;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
-	odp.pszTitle = LPGEN("Contact list");
+	odp.szTitle.a = LPGEN("Contact list");
 	odp.pfnDlgProc = DlgProcClistListOpts;
 	odp.flags = ODPF_BOLDGROUPS;
 
 	for (int i = 0; i < _countof(clist_opt_items); i++) {
 		odp.pszTemplate = MAKEINTRESOURCEA(clist_opt_items[i].id);
-		odp.pszTab = clist_opt_items[i].name;
+		odp.szTab.a = clist_opt_items[i].name;
 		odp.pfnDlgProc = clist_opt_items[i].wnd_proc;
 		odp.flags = ODPF_BOLDGROUPS | clist_opt_items[i].flag;
 		Options_AddPage(wParam, &odp);
@@ -1831,9 +1831,9 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 
 	if (g_CluiData.fDisableSkinEngine) {
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST_LISTBKG);
-		odp.pszGroup = LPGEN("Skins");
-		odp.pszTitle = LPGEN("Contact list");
-		odp.pszTab = LPGEN("List background");
+		odp.szGroup.a = LPGEN("Skins");
+		odp.szTitle.a = LPGEN("Contact list");
+		odp.szTab.a = LPGEN("List background");
 		odp.pfnDlgProc = DlgProcClcBkgOpts;
 		odp.flags = ODPF_BOLDGROUPS;
 		Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 2039a0deb4..41cf048c9c 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -933,13 +933,13 @@ int CListOptInit(WPARAM wParam, LPARAM)
 	odp.position = -200000000;
 	odp.hInstance = g_hInst;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ITEMS);
-	odp.pszGroup = LPGEN("Contact list");
-	odp.pszTitle = LPGEN("Row items");
+	odp.szGroup.a = LPGEN("Contact list");
+	odp.szTitle.a = LPGEN("Row items");
 	odp.flags = ODPF_BOLDGROUPS;
 
 	for (int i = 0; i < _countof(row_opt_items); i++) {
 		odp.pszTemplate = MAKEINTRESOURCEA(row_opt_items[i].id);
-		odp.pszTab = row_opt_items[i].name;
+		odp.szTab.a = row_opt_items[i].name;
 		odp.pfnDlgProc = row_opt_items[i].wnd_proc;
 		Options_AddPage(wParam, &odp);
 	}
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 161038a4f5..e47add0db3 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -53,8 +53,8 @@ int SkinOptInit(WPARAM wParam, LPARAM)
 		odp.hInstance = g_hInst;
 		odp.pfnDlgProc = DlgSkinOpts;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
-		odp.pwszGroup = LPGENW("Skins");
-		odp.pwszTitle = LPGENW("Contact list");
+		odp.szGroup.w = LPGENW("Skins");
+		odp.szTitle.w = LPGENW("Contact list");
 		odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 		Options_AddPage(wParam, &odp);
 	}
-- 
cgit v1.2.3