- 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, 7 insertions, 7 deletions

diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp
index 6e9374dea6..9c0e515806 100644
--- a/plugins/Weather/src/weather_opt.cpp
+++ b/plugins/Weather/src/weather_opt.cpp
@@ -577,25 +577,25 @@ int OptInit(WPARAM wParam, LPARAM)
 	odp.position = 95600;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.pfnDlgProc = OptionsProc;

-	odp.pszGroup = LPGEN("Network");

-	odp.pszTitle = WEATHERPROTOTEXT;

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

+	odp.szGroup.a = LPGEN("Network");

+	odp.szTitle.a = WEATHERPROTOTEXT;

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

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	// text options

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_TEXTOPT);

 	odp.pfnDlgProc = DlgProcText;

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

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

 	Options_AddPage(wParam, &odp);

 

 	// if popup service exists, load the weather popup options

 	if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {

 		odp.position = 100000000;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

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

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

 		odp.groupPosition = 910000000;

-		odp.pszTab = NULL;

+		odp.szTab.a = NULL;

 		odp.pfnDlgProc = DlgPopupOpts;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index 6eb376998d..9462ead897 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -316,7 +316,7 @@ int UserInfoInit(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

 	odp.position = 100000000;

-	odp.pszTitle = WEATHERPROTONAME;

+	odp.szTitle.a = WEATHERPROTONAME;

 

 	if (lParam == 0) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO);