- old useless helpers removed from the Options module;

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

3 files changed, 7 insertions, 7 deletions

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index d0c625c2c7..aa1186d684 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -429,15 +429,15 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

-	odp.pszGroup = LPGEN("Contact list");

+	odp.szGroup.a = LPGEN("Contact list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

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

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

 	odp.pfnDlgProc = DlgProcClcMainOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);

-	odp.pszTitle = LPGEN("List background");

+	odp.szTitle.a = LPGEN("List background");

 	odp.pfnDlgProc = DlgProcClcBkgOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index c0cd03b652..3cb99c8a2b 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -202,7 +202,7 @@ int CListOptInit(WPARAM wParam, LPARAM)
 	odp.position = -1000000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);

-	odp.pszTitle = LPGEN("Contact list");

+	odp.szTitle.a = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcGenOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index d911261f71..0c27835461 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -318,14 +318,14 @@ int CluiOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);

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

-	odp.pszGroup = LPGEN("Contact list");

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

+	odp.szGroup.a = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcCluiOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);

-	odp.pszTitle = LPGEN("Status bar");

+	odp.szTitle.a = LPGEN("Status bar");

 	odp.pfnDlgProc = DlgProcSBarOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);