- old useless helpers removed from the Options module;

- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h

2 files changed, 4 insertions, 4 deletions

diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp
index 748e73dfc8..ccf5046923 100644
--- a/plugins/YAPP/src/notify_imp.cpp
+++ b/plugins/YAPP/src/notify_imp.cpp
@@ -97,7 +97,7 @@ int NotifyOptionsInitialize(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);

-	odp.pszTitle = LPGEN("YAPP Popups");

+	odp.szTitle.a = LPGEN("YAPP Popups");

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = DlgProcPopups;

 	CallService(MS_NOTIFY_OPT_ADDPAGE, wParam, (LPARAM)&odp);

diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index ef7a83f2ee..47720f25a9 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -477,15 +477,15 @@ int OptInit(WPARAM wParam, LPARAM)
 	odp.flags = ODPF_BOLDGROUPS;

 	odp.position = -790000000;

 	odp.hInstance = hInst;

-	odp.pszTitle = LPGEN("Popups");

+	odp.szTitle.a = LPGEN("Popups");

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);

-	odp.pszTab = LPGEN("Settings");

+	odp.szTab.a = LPGEN("Settings");

 	odp.pfnDlgProc = DlgProcOpts1;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLASSES);

-	odp.pszTab = LPGEN("Classes");

+	odp.szTab.a = LPGEN("Classes");

 	odp.pfnDlgProc = DlgProcOptsClasses;

 	Options_AddPage(wParam, &odp);

 	return 0;