upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 18:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some missed rename instances and wrong widget/window IDs

Browse Source
This commit is contained in:
Charles Dang 2016-11-10 18:20:04 +11:00 committed by Celtic Minstrel
parent ed206daf23
commit 5872f52879
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gui/window/loadscreen.cfg
View File

@ -54,7 +54,7 @@
#enddef
[window]
id = "loadscreen"
id = "loading_screen"
description = "Loadscreen."
[resolution]

2
data/gui/window/preferences.cfg
View File

@ -123,7 +123,7 @@
#enddef
[window]
id = "preferences"
id = "preferences_dialog"
description = "Main game preferences dialog."
[resolution]

2
src/gui/widgets/password_box.cpp
View File

@ -35,7 +35,7 @@ namespace gui2
// ------------ WIDGET -----------{
REGISTER_WIDGET3(text_box_definition, password_box, "ext_box_definition")
REGISTER_WIDGET3(text_box_definition, password_box, "text_box_definition")
void password_box::set_value(const std::string& text)
{

6
src/gui/widgets/tree_view_node.cpp
View File

@ -617,16 +617,16 @@ void tree_view_node::init_grid(
} else if(grid* child_grid = dynamic_cast<grid*>(wgt)) {
init_grid(child_grid, data);
} else if(styled_widget* control = dynamic_cast<styled_widget*>(wgt)) {
auto itor = data.find(ctrl->id());
auto itor = data.find(control->id());
if(itor == data.end()) {
itor = data.find("");
}
if(itor != data.end()) {
ctrl->set_members(itor->second);
control->set_members(itor->second);
}
// ctrl->set_members(data);
// control->set_members(data);
} else {
// ERROR_LOG("Widget type '" << typeid(*widget).name() << "'.");
}

2
src/play_controller.cpp
View File

@ -1025,7 +1025,7 @@ void play_controller::update_savegame_snapshot() const
this->saved_game_.set_snapshot(to_config());
}
game_events::pump& play_controller::pump()
game_events::wml_event_pump& play_controller::pump()
{
return gamestate().events_manager_->pump();
}

4
src/play_controller.hpp
View File

@ -45,8 +45,8 @@ namespace actions {
}
namespace game_events {
class pump;
class manager;
class wml_event_pump;
class wml_menu_item;
} // namespace game_events
@ -201,7 +201,7 @@ public:
int get_server_request_number() const { return gamestate().server_request_number_; }
void increase_server_request_number() { ++gamestate().server_request_number_; }
game_events::pump& pump();
game_events::wml_event_pump& pump();
int get_ticks();

12
src/scripting/lua_gui2.cpp
View File

@ -496,7 +496,7 @@ int intf_set_dialog_value(lua_State *L)
else
{
t_string v = luaW_checktstring(L, 1);
gui2::control *c = dynamic_cast<gui2::control *>(w);
gui2::styled_widget *c = dynamic_cast<gui2::styled_widget *>(w);
if (!c) return luaL_argerror(L, lua_gettop(L), "unsupported widget");
c->set_label(v);
}
@ -696,7 +696,7 @@ int intf_set_dialog_markup(lua_State *L)
{
bool b = luaW_toboolean(L, 1);
gui2::widget *w = find_widget(L, 2, true);
gui2::control *c = dynamic_cast<gui2::control *>(w);
gui2::styled_widget *c = dynamic_cast<gui2::styled_widget *>(w);
if (!c) return luaL_argerror(L, lua_gettop(L), "unsupported widget");
c->set_use_markup(b);
@ -713,7 +713,7 @@ int intf_set_dialog_canvas(lua_State *L)
{
int i = luaL_checkinteger(L, 1);
gui2::widget *w = find_widget(L, 3, true);
gui2::control *c = dynamic_cast<gui2::control *>(w);
gui2::styled_widget *c = dynamic_cast<gui2::styled_widget *>(w);
if (!c) return luaL_argerror(L, lua_gettop(L), "unsupported widget");
std::vector<gui2::canvas> &cv = c->get_canvas();
@ -746,7 +746,7 @@ int intf_set_dialog_active(lua_State *L)
{
const bool b = luaW_toboolean(L, 1);
gui2::widget *w = find_widget(L, 2, true);
gui2::control *c = dynamic_cast<gui2::control *>(w);
gui2::styled_widget *c = dynamic_cast<gui2::styled_widget *>(w);
if (!c) return luaL_argerror(L, lua_gettop(L), "unsupported widget");
c->set_active(b);
@ -760,7 +760,7 @@ int intf_set_dialog_active(lua_State *L)
*/
int intf_set_dialog_visible(lua_State *L)
{
typedef gui2::control::visibility visibility;
typedef gui2::styled_widget::visibility visibility;
visibility flag = visibility::visible;
@ -789,7 +789,7 @@ int intf_set_dialog_visible(lua_State *L)
}
gui2::widget *w = find_widget(L, 2, true);
gui2::control *c = dynamic_cast<gui2::control *>(w);
gui2::styled_widget *c = dynamic_cast<gui2::styled_widget *>(w);
if (!c) return luaL_argerror(L, lua_gettop(L), "unsupported widget");
c->set_visible(flag);

2
src/tests/gui/fire_event.cpp
View File

@ -33,7 +33,7 @@ static void print(std::stringstream& sstr
sstr << queue << ':' << id << '\n';
}
template<gui2::event::event_t E>
template<gui2::event::ui_event E>
void connect_queue(
std::stringstream& sstr
, gui2::widget& widget)