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

diff --git a/plugins/MirLua/src/m_options.cpp b/plugins/MirLua/src/m_options.cpp
index f55af0f6d0..95330c4bea 100644
--- a/plugins/MirLua/src/m_options.cpp
+++ b/plugins/MirLua/src/m_options.cpp
@@ -54,15 +54,15 @@ void MakeOptionDialogPage(lua_State *L, OPTIONSDIALOGPAGE &odp)
 		odp.flags |= ODPF_UNICODE;

 

 	lua_getfield(L, -1, "Group");

-	odp.pwszGroup = mir_utf8decodeW(lua_tostring(L, -1));

+	odp.szGroup.w = mir_utf8decodeW(lua_tostring(L, -1));

 	lua_pop(L, 1);

 

 	lua_getfield(L, -1, "Title");

-	odp.pwszTitle = mir_utf8decodeW(luaL_checkstring(L, -1));

+	odp.szTitle.w = mir_utf8decodeW(luaL_checkstring(L, -1));

 	lua_pop(L, 1);

 

 	lua_getfield(L, -1, "Tab");

-	odp.pwszTab = mir_utf8decodeW(lua_tostring(L, -1));

+	odp.szTab.w = mir_utf8decodeW(lua_tostring(L, -1));

 	lua_pop(L, 1);

 

 	int onInitDialogRef = LUA_NOREF;

@@ -95,9 +95,9 @@ int opt_AddPage(lua_State *L)
 	INT_PTR res = Options_AddPage(wParam, &odp);

 	lua_pushboolean(L, !res);

 

-	mir_free(odp.pwszGroup);

-	mir_free(odp.pwszTitle);

-	mir_free(odp.pwszTab);

+	mir_free(odp.szGroup.w);

+	mir_free(odp.szTitle.w);

+	mir_free(odp.szTab.w);

 

 	return 1;

 }

diff --git a/plugins/MirLua/src/mlua_options.cpp b/plugins/MirLua/src/mlua_options.cpp
index dca7c9f363..86eb481ebb 100644
--- a/plugins/MirLua/src/mlua_options.cpp
+++ b/plugins/MirLua/src/mlua_options.cpp
@@ -161,9 +161,9 @@ int CMLuaOptions::OnOptionsInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInstance;

 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;

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

-	odp.pwszTitle = L"Lua";

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

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

+	odp.szTitle.w = L"Lua";

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

 	odp.pDialog = CMLuaOptions::CreateOptionsPage();

 	Options_AddPage(wParam, &odp);