0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2/Message: removed deprecated handling of legacy DescriptionWML

Browse source 
Left a TODO to implement the "specify options with a single string" thing the
old comment mentioned.
This commit is contained in:
Charles Dang 2018-06-24 04:12:21 +11:00
parent c8a8b82b9f
commit 5c860aee48
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/scripting/lua_gui2.cpp
View file

@ -14,7 +14,6 @@
#include "scripting/lua_gui2.hpp"
#include "gui/auxiliary/old_markup.hpp"
#include "gui/core/canvas.hpp"
#include "gui/core/gui_definition.hpp"
#include "gui/core/window_builder.hpp"
@ -291,16 +290,7 @@ int show_message_dialog(lua_State* L)
t_string short_opt;
config opt;
if(luaW_totstring(L, -1, short_opt)) {
// Note: Although this currently uses the legacy_menu_item class
// for the deprecated syntax, this branch should still be retained
// when the deprecated syntax is removed, as a simpler method
// of specifying options when only a single string is needed.
const std::string& opt_str = short_opt;
gui2::legacy_menu_item item(opt_str, "Use image=, label=, description=, default= instead.");
opt["image"] = item.icon();
opt["label"] = item.label();
opt["description"] = item.description();
opt["default"] = item.is_default();
// TODO: add some way to specify options with a single string?
} else if(!luaW_toconfig(L, -1, opt)) {
std::ostringstream error;
error << "expected array of config and/or translatable strings, but index ";