- old useless helpers removed from the Options module;

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

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 8cf20a395a..c3c2becfc3 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -43,25 +43,25 @@ int GpgOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);

-	odp.pwszTitle = _T(szGPGModuleName);

-	odp.pwszGroup = LPGENW("Services");

-	odp.pwszTab = LPGENW("Main");

+	odp.szTitle.w = _T(szGPGModuleName);

+	odp.szGroup.w = LPGENW("Services");

+	odp.szTab.w = LPGENW("Main");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;

 	odp.pfnDlgProc = DlgProcGpgOpts;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);

-	odp.pwszTab = LPGENW("GnuPG Variables");

+	odp.szTab.w = LPGENW("GnuPG Variables");

 	odp.pfnDlgProc = DlgProcGpgBinOpts;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_MESSAGES);

-	odp.pwszTab = LPGENW("Messages");

+	odp.szTab.w = LPGENW("Messages");

 	odp.pfnDlgProc = DlgProcGpgMsgOpts;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);

-	odp.pwszTab = LPGENW("Advanced");

+	odp.szTab.w = LPGENW("Advanced");

 	odp.pfnDlgProc = DlgProcGpgAdvOpts;

 	Options_AddPage(wParam, &odp);

 	return 0;