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

GUI2: removed CVideo argument from tdialog::preshow

Browse source 
In all but three cases, this argument was unused. In those remaining cases,
the argument could be replaced by twindow::video().
This commit is contained in:
Charles Dang 2016-03-15 02:15:28 +11:00
parent b2fff5afd9
commit 11b941ab58
107 changed files with 124 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/dialogs/addon/description.cpp
View file

@ -366,7 +366,7 @@ void taddon_description::copy_url_callback()
desktop::clipboard::copy_to_clipboard(feedback_url_, false);
}
void taddon_description::pre_show(CVideo& /*video*/, twindow& window)
void taddon_description::pre_show(twindow& window)
{
tcontrol& url_none = find_widget<tcontrol>(&window, "url_none", false);
tbutton& url_go_button = find_widget<tbutton>(&window, "url_go", false);

2
src/gui/dialogs/addon/description.hpp
View file

@ -59,7 +59,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
void browse_url_callback();
void copy_url_callback();

2
src/gui/dialogs/addon/filter_options.cpp
View file

@ -185,7 +185,7 @@ void taddon_filter_options::toggle_dir_callback()
dir_ = dir_tgroup_.get_active_member_value();
}
void taddon_filter_options::pre_show(CVideo& /*video*/, twindow& window)
void taddon_filter_options::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "statuses_list", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/addon/filter_options.hpp
View file

@ -110,7 +110,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/addon/uninstall_list.cpp
View file

@ -55,7 +55,7 @@ namespace gui2
REGISTER_DIALOG(addon_uninstall_list)
void taddon_uninstall_list::pre_show(CVideo& /*video*/, twindow& window)
void taddon_uninstall_list::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "addons_list", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/addon/uninstall_list.hpp
View file

@ -49,7 +49,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/addon_connect.cpp
View file

@ -66,7 +66,7 @@ void taddon_connect::help_button_callback(twindow& window)
help::show_help(window.video(), "installing_addons");
}
void taddon_connect::pre_show(CVideo& /*video*/, twindow& window)
void taddon_connect::pre_show(twindow& window)
{
find_widget<tbutton>(&window, "remove_addons", false)
.set_active(allow_remove_);

2
src/gui/dialogs/addon_connect.hpp
View file

@ -51,7 +51,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/addon_list.cpp
View file

@ -375,7 +375,7 @@ static std::string describe_status_verbose(const addon_tracking_info& state)
return colorify_addon_state_string(s, state);
}
void taddon_list::pre_show(CVideo& /*video*/, twindow& window)
void taddon_list::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "addons", false);

2
src/gui/dialogs/addon_list.hpp
View file

@ -52,7 +52,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Config which contains the list with the campaigns. */
const config& cfg_;

2
src/gui/dialogs/advanced_graphics_options.cpp
View file

@ -80,7 +80,7 @@ tadvanced_graphics_options::tadvanced_graphics_options()
{
}
void tadvanced_graphics_options::pre_show(CVideo& /*video*/, twindow& window)
void tadvanced_graphics_options::pre_show(twindow& window)
{
BOOST_FOREACH(const std::string & i, scale_cases) {
setup_scale_case(i, window);

2
src/gui/dialogs/advanced_graphics_options.hpp
View file

@ -56,7 +56,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/campaign_difficulty.cpp
View file

@ -112,7 +112,7 @@ tcampaign_difficulty::tcampaign_difficulty(
}
}
void tcampaign_difficulty::pre_show(CVideo& /*video*/, twindow& window)
void tcampaign_difficulty::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/campaign_difficulty.hpp
View file

@ -49,7 +49,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

4
src/gui/dialogs/campaign_selection.cpp
View file

@ -120,7 +120,7 @@ void tcampaign_selection::show_settings(CVideo& video) {
settings_dlg.show(video);
}
void tcampaign_selection::pre_show(CVideo& video, twindow& window)
void tcampaign_selection::pre_show(twindow& window)
{
if(new_widgets || true) {
/***** Setup campaign tree. *****/
@ -273,7 +273,7 @@ void tcampaign_selection::pre_show(CVideo& video, twindow& window)
find_widget<tbutton>(&window, "advanced_settings", false, false);
if(advanced_settings_button) {
advanced_settings_button->connect_click_handler(
boost::bind(&tcampaign_selection::show_settings, this, boost::ref(video)));
boost::bind(&tcampaign_selection::show_settings, this, boost::ref(window.video())));
}
}

2
src/gui/dialogs/campaign_selection.hpp
View file

@ -55,7 +55,7 @@ private:
void show_settings(CVideo& video);
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/campaign_settings.cpp
View file

@ -149,7 +149,7 @@ void tcampaign_settings::update_lists(twindow& window)
}
}
void tcampaign_settings::pre_show(CVideo&, twindow& window)
void tcampaign_settings::pre_show(twindow& window)
{
find_widget<ttoggle_button>(&window, "mp_connect", false).set_value(
engine_.get_state().mp_settings().show_connect);

2
src/gui/dialogs/campaign_settings.hpp
View file

@ -54,7 +54,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

6
src/gui/dialogs/chat_log.cpp
View file

@ -346,7 +346,7 @@ public:
{
}
void pre_show(CVideo& /*video*/, twindow& window)
void pre_show(twindow& window)
{
LOG_CHAT_LOG << "Entering tchat_log::view::pre_show" << std::endl;
controller_.update_view_from_model(true);
@ -448,11 +448,11 @@ twindow* tchat_log::build_window(CVideo& video)
return build(video, window_id());
}
void tchat_log::pre_show(CVideo& video, twindow& window)
void tchat_log::pre_show(twindow& window)
{
LOG_CHAT_LOG << "Entering tchat_log::pre_show" << std::endl;
view_->bind(window);
view_->pre_show(video, window);
view_->pre_show(window);
LOG_CHAT_LOG << "Exiting tchat_log::pre_show" << std::endl;
}

2
src/gui/dialogs/chat_log.hpp
View file

@ -37,7 +37,7 @@ public:
twindow* build_window(CVideo& video);
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
boost::shared_ptr<view> get_view();

2
src/gui/dialogs/core_selection.cpp
View file

@ -83,7 +83,7 @@ void tcore_selection::core_selected(twindow& window)
multi_page.select_page(selected_row);
}
void tcore_selection::pre_show(CVideo& /*video*/, twindow& window)
void tcore_selection::pre_show(twindow& window)
{
/***** Setup core list. *****/
tlistbox& list = find_widget<tlistbox>(&window, "core_list", false);

2
src/gui/dialogs/core_selection.hpp
View file

@ -46,7 +46,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/data_manage.cpp
View file

@ -58,7 +58,7 @@ tdata_manage::tdata_manage()
{
}
void tdata_manage::pre_show(CVideo& /*video*/, twindow& window)
void tdata_manage::pre_show(twindow& window)
{
assert(txtFilter_);

2
src/gui/dialogs/data_manage.hpp
View file

@ -36,7 +36,7 @@ public:
protected:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
private:
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */

2
src/gui/dialogs/debug_clock.cpp
View file

@ -76,7 +76,7 @@ namespace gui2
REGISTER_DIALOG(debug_clock)
void tdebug_clock::pre_show(CVideo& /*video*/, twindow& window)
void tdebug_clock::pre_show(twindow& window)
{
hour_percentage_ = find_widget<tprogress_bar>(
&window, "hour_percentage", false, false);

2
src/gui/dialogs/debug_clock.hpp
View file

@ -128,7 +128,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(CVideo& video);

2
src/gui/dialogs/depcheck_select_new.cpp
View file

@ -87,7 +87,7 @@ tdepcheck_select_new::tdepcheck_select_new(
register_label("message", false, message);
}
void tdepcheck_select_new::pre_show(CVideo& /*video*/, twindow& window)
void tdepcheck_select_new::pre_show(twindow& window)
{
tlistbox& listbox = find_widget<tlistbox>(&window, "itemlist", false);

2
src/gui/dialogs/depcheck_select_new.hpp
View file

@ -51,7 +51,7 @@ protected:
virtual const std::string& window_id() const;
/** Inherited from tdialog */
virtual void pre_show(CVideo& video, twindow& window);
virtual void pre_show(twindow& window);
/** Inherited from tdialog */
virtual void post_show(twindow& window);

4
src/gui/dialogs/dialog.cpp
View file

@ -47,7 +47,7 @@ bool tdialog::show(CVideo& video, const unsigned auto_close_time)
init_fields(*window);
pre_show(video, *window);
pre_show(*window);
retval_ = window->show(restore_, auto_close_time);
@ -179,7 +179,7 @@ void tdialog::post_build(CVideo& /*video*/, twindow& /*window*/)
/* DO NOTHING */
}
void tdialog::pre_show(CVideo& /*video*/, twindow& /*window*/)
void tdialog::pre_show(twindow& /*window*/)
{
/* DO NOTHING */
}

4
src/gui/dialogs/dialog.hpp
View file

@ -369,11 +369,9 @@ private:
* At this point the registered fields are registered and initialized with
* their initial values.
*
* @param video The video which contains the surface to draw
* upon.
* @param window The window to be shown.
*/
virtual void pre_show(CVideo& video, twindow& window);
virtual void pre_show(twindow& window);
/**
* Actions to be taken after the window has been shown.

2
src/gui/dialogs/drop_down_list.cpp
View file

@ -47,7 +47,7 @@ namespace {
}
}
void tdrop_down_list::pre_show(CVideo& /*video*/, twindow& window)
void tdrop_down_list::pre_show(twindow& window)
{
window.set_variable("button_x", variant(button_pos_.x));
window.set_variable("button_y", variant(button_pos_.y));

2
src/gui/dialogs/drop_down_list.hpp
View file

@ -43,7 +43,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/editor/custom_tod.cpp
View file

@ -249,7 +249,7 @@ void tcustom_tod::update_selected_tod_info(twindow& window)
window.invalidate_layout();
}
void tcustom_tod::pre_show(CVideo& /*video*/, twindow& window)
void tcustom_tod::pre_show(twindow& window)
{
assert(!tods_.empty());
current_tod_name_

2
src/gui/dialogs/editor/custom_tod.hpp
View file

@ -83,7 +83,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/editor/editor_edit_side.cpp
View file

@ -86,7 +86,7 @@ teditor_edit_side::teditor_edit_side(int side,
register_bool("hidden", true, hidden);
}
void teditor_edit_side::pre_show(CVideo& /*video*/, twindow& window)
void teditor_edit_side::pre_show(twindow& window)
{
register_radio_toggle<team::CONTROLLER>("controller_human", controller_group, team::CONTROLLER::HUMAN, controller_, window);
register_radio_toggle<team::CONTROLLER>("controller_ai", controller_group, team::CONTROLLER::AI, controller_, window);

2
src/gui/dialogs/editor/editor_edit_side.hpp
View file

@ -73,7 +73,7 @@ public:
}
private:
void pre_show(CVideo& /*video*/, twindow& window);
void pre_show(twindow& window);
void post_show(twindow& window);
template <typename T>

2
src/gui/dialogs/editor_generate_map.cpp
View file

@ -103,7 +103,7 @@ void teditor_generate_map::select_map_generator(map_generator* mg)
last_map_generator_ = mg;
}
void teditor_generate_map::pre_show(CVideo& /*video*/, twindow& window)
void teditor_generate_map::pre_show(twindow& window)
{
assert(!map_generators_.empty());

2
src/gui/dialogs/editor_generate_map.hpp
View file

@ -55,7 +55,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Callback for generator list selection changes. */
void do_generator_selected(twindow& window);

2
src/gui/dialogs/editor_resize_map.cpp
View file

@ -104,7 +104,7 @@ teditor_resize_map::teditor_resize_map(int& width,
register_label("old_height", false, str_cast(height));
}
void teditor_resize_map::pre_show(CVideo& /*video*/, twindow& window)
void teditor_resize_map::pre_show(twindow& window)
{
tslider& height = find_widget<tslider>(&window, "height", false);
connect_signal_notify_modified(

2
src/gui/dialogs/editor_resize_map.hpp
View file

@ -111,7 +111,7 @@ private:
void set_direction_icon(int index, std::string icon);
/** Inherited from tdialog */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;

2
src/gui/dialogs/editor_set_starting_position.cpp
View file

@ -76,7 +76,7 @@ teditor_set_starting_position::teditor_set_starting_position(
}
}
void teditor_set_starting_position::pre_show(CVideo& /*video*/, twindow& window)
void teditor_set_starting_position::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/editor_set_starting_position.hpp
View file

@ -45,7 +45,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/formula_debugger.cpp
View file

@ -65,7 +65,7 @@ namespace gui2
REGISTER_DIALOG(formula_debugger)
void tformula_debugger::pre_show(CVideo& /*video*/, twindow& window)
void tformula_debugger::pre_show(twindow& window)
{
// stack label
tcontrol* stack_label

2
src/gui/dialogs/formula_debugger.hpp
View file

@ -34,7 +34,7 @@ public:
private:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;

6
src/gui/dialogs/game_cache_options.cpp
View file

@ -82,7 +82,7 @@ tgame_cache_options::tgame_cache_options()
{
}
void tgame_cache_options::pre_show(CVideo& video, twindow& window)
void tgame_cache_options::pre_show(twindow& window)
{
clean_button_ = &find_widget<tbutton>(&window, "clean", false);
purge_button_ = &find_widget<tbutton>(&window, "purge", false);
@ -111,12 +111,12 @@ void tgame_cache_options::pre_show(CVideo& video, twindow& window)
connect_signal_mouse_left_click(*clean_button_,
boost::bind(&tgame_cache_options::clean_cache_callback,
this,
boost::ref(video)));
boost::ref(window.video())));
connect_signal_mouse_left_click(*purge_button_,
boost::bind(&tgame_cache_options::purge_cache_callback,
this,
boost::ref(video)));
boost::ref(window.video())));
}
void tgame_cache_options::post_show(twindow& /*window*/)

2
src/gui/dialogs/game_cache_options.hpp
View file

@ -61,7 +61,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/game_load.cpp
View file

@ -105,7 +105,7 @@ tgame_load::tgame_load(const config& cache_config)
{
}
void tgame_load::pre_show(CVideo& /*video*/, twindow& window)
void tgame_load::pre_show(twindow& window)
{
assert(txtFilter_);

2
src/gui/dialogs/game_load.hpp
View file

@ -52,7 +52,7 @@ public:
protected:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/game_version.cpp
View file

@ -124,7 +124,7 @@ tgame_version::tgame_version()
generate_plain_text_report();
}
void tgame_version::pre_show(CVideo& /*video*/, twindow& window)
void tgame_version::pre_show(twindow& window)
{
string_map i18n_syms;

2
src/gui/dialogs/game_version.hpp
View file

@ -75,7 +75,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
//
// Widget event callbacks.

6
src/gui/dialogs/gamestate_inspector.cpp
View file

@ -754,7 +754,7 @@ public:
{
}
void pre_show(CVideo& /*video*/, twindow& /*window*/)
void pre_show(twindow& /*window*/)
{
controller_.show_stuff_types_list();
controller_.update_view_from_model();
@ -858,10 +858,10 @@ boost::shared_ptr<tgamestate_inspector::view> tgamestate_inspector::get_view()
return view_;
}
void tgamestate_inspector::pre_show(CVideo& video, twindow& window)
void tgamestate_inspector::pre_show(twindow& window)
{
view_->bind(window);
view_->pre_show(video, window);
view_->pre_show(window);
}
} // end of namespace gui2

2
src/gui/dialogs/gamestate_inspector.hpp
View file

@ -35,7 +35,7 @@ public:
private:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;

2
src/gui/dialogs/label_settings.cpp
View file

@ -73,7 +73,7 @@ tlabel_settings::tlabel_settings(display_context& dc) : viewer(dc) {
}
}
void tlabel_settings::pre_show(CVideo& /*video*/, twindow& window) {
void tlabel_settings::pre_show(twindow& window) {
std::map<std::string, string_map> list_data;
tlistbox& cats_listbox = find_widget<tlistbox>(&window, "label_types", false);
FOREACH(const AUTO & label_entry, all_labels) {

2
src/gui/dialogs/label_settings.hpp
View file

@ -40,7 +40,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Callback for toggling a checkbox state. */
void toggle_category(twidget& box, std::string category);

2
src/gui/dialogs/language_selection.cpp
View file

@ -59,7 +59,7 @@ namespace gui2
REGISTER_DIALOG(language_selection)
void tlanguage_selection::pre_show(CVideo& /*video*/, twindow& window)
void tlanguage_selection::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "language_list", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/language_selection.hpp
View file

@ -32,7 +32,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/lobby_main.cpp
View file

@ -906,7 +906,7 @@ void tlobby_main::update_selected_game()
player_list_dirty_ = true;
}
void tlobby_main::pre_show(CVideo& /*video*/, twindow& window)
void tlobby_main::pre_show(twindow& window)
{
SCOPE_LB;
roomlistbox_ = find_widget<tlistbox>(&window, "room_list", false, true);

2
src/gui/dialogs/lobby_main.hpp
View file

@ -358,7 +358,7 @@ private:
virtual void post_build(CVideo& video, twindow& window);
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/lobby_player_info.cpp
View file

@ -50,7 +50,7 @@ tlobby_player_info::~tlobby_player_info()
{
}
void tlobby_player_info::pre_show(CVideo& /*video*/, twindow& window)
void tlobby_player_info::pre_show(twindow& window)
{
relation_ = find_widget<tlabel>(&window, "relation_info", false, true);
connect_signal_mouse_left_click(

2
src/gui/dialogs/lobby_player_info.hpp
View file

@ -45,7 +45,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/lua_interpreter.cpp
View file

@ -660,7 +660,7 @@ twindow* tlua_interpreter::build_window(CVideo& video)
}
/** Bind the controller, initialize one of the static labels with info about this kernel, and update the view. */
void tlua_interpreter::pre_show(CVideo& /*video*/, twindow& window)
void tlua_interpreter::pre_show(twindow& window)
{
LOG_LUA << "Entering tlua_interpreter::view::pre_show" << std::endl;
register_text("text_entry", false, controller_->text_entry_, true);

2
src/gui/dialogs/lua_interpreter.hpp
View file

@ -38,7 +38,7 @@ public:
twindow* build_window(CVideo& video);
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
enum WHICH_KERNEL { APP, GAME };
static void display(CVideo& video, lua_kernel_base * lk);

2
src/gui/dialogs/message.cpp
View file

@ -63,7 +63,7 @@ struct tmessage_implementation
}
};
void tmessage::pre_show(CVideo& /*video*/, twindow& window)
void tmessage::pre_show(twindow& window)
{
// ***** Validate the required buttons ***** ***** ***** *****
tmessage_implementation::init_button(window, buttons_[left_1], "left_side");

2
src/gui/dialogs/message.hpp
View file

@ -107,7 +107,7 @@ public:
protected:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/mp_alerts_options.cpp
View file

@ -124,7 +124,7 @@ tmp_alerts_options::tmp_alerts_options()
{
}
void tmp_alerts_options::pre_show(CVideo& /*video*/, twindow& window)
void tmp_alerts_options::pre_show(twindow& window)
{
BOOST_FOREACH(const std::string & i, mp_ui_alerts::items) {
setup_item(i, window);

2
src/gui/dialogs/mp_alerts_options.hpp
View file

@ -42,7 +42,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

6
src/gui/dialogs/mp_change_control.cpp
View file

@ -321,7 +321,7 @@ public:
{
}
void pre_show(CVideo& /*video*/, twindow& window)
void pre_show(twindow& window)
{
model_.clear_sides();
controller_.show_sides_list();
@ -403,10 +403,10 @@ boost::shared_ptr<tmp_change_control::view> tmp_change_control::get_view()
return view_;
}
void tmp_change_control::pre_show(CVideo& video, twindow& window)
void tmp_change_control::pre_show(twindow& window)
{
view_->bind(window);
view_->pre_show(video, window);
view_->pre_show(window);
}
void tmp_change_control::post_show(twindow& /*window*/)

2
src/gui/dialogs/mp_change_control.hpp
View file

@ -39,7 +39,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
void post_show(twindow& window);
events::menu_handler* menu_handler_;

2
src/gui/dialogs/mp_cmd_wrapper.cpp
View file

@ -91,7 +91,7 @@ tmp_cmd_wrapper::tmp_cmd_wrapper(const t_string& user)
set_always_save_fields(true);
}
void tmp_cmd_wrapper::pre_show(CVideo& /*video*/, twindow& window)
void tmp_cmd_wrapper::pre_show(twindow& window)
{
#if defined(_WIN32) || defined(__APPLE__)
ttext_box* message

2
src/gui/dialogs/mp_cmd_wrapper.hpp
View file

@ -58,7 +58,7 @@ private:
std::string time_;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;

8
src/gui/dialogs/mp_connect.cpp
View file

@ -77,7 +77,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);
@ -85,7 +85,7 @@ private:
REGISTER_DIALOG(mp_server_list)
void tmp_server_list::pre_show(CVideo& /*video*/, twindow& window)
void tmp_server_list::pre_show(twindow& window)
{
set_restore(true);
@ -172,7 +172,7 @@ tmp_connect::tmp_connect()
set_restore(true);
}
void tmp_connect::pre_show(CVideo& video, twindow& window)
void tmp_connect::pre_show(twindow& window)
{
assert(host_name_);
@ -181,7 +181,7 @@ void tmp_connect::pre_show(CVideo& video, twindow& window)
connect_signal_mouse_left_click(*button,
boost::bind(show_server_list,
boost::ref(video),
boost::ref(window.video()),
boost::ref(window),
host_name_));
}

2
src/gui/dialogs/mp_connect.hpp
View file

@ -33,7 +33,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** The host name of the selected servef. */
tfield_text* host_name_;

2
src/gui/dialogs/mp_create_game.cpp
View file

@ -77,7 +77,7 @@ tmp_create_game::tmp_create_game(const config& cfg)
{
}
void tmp_create_game::pre_show(CVideo& /*video*/, twindow& window)
void tmp_create_game::pre_show(twindow& window)
{
find_widget<tminimap>(&window, "minimap", false).set_config(&cfg_);

2
src/gui/dialogs/mp_create_game.hpp
View file

@ -32,7 +32,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/mp_login.cpp
View file

@ -84,7 +84,7 @@ tmp_login::tmp_login(const std::string& label, const bool focus_password)
&preferences::set_remember_password);
}
void tmp_login::pre_show(CVideo& /*video*/, twindow& window)
void tmp_login::pre_show(twindow& window)
{
if(tbutton* button
= find_widget<tbutton>(&window, "password_reminder", false, false)) {

2
src/gui/dialogs/mp_login.hpp
View file

@ -30,7 +30,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/mp_method_selection.cpp
View file

@ -54,7 +54,7 @@ namespace gui2
REGISTER_DIALOG(mp_method_selection)
void tmp_method_selection::pre_show(CVideo& /*video*/, twindow& window)
void tmp_method_selection::pre_show(twindow& window)
{
user_name_ = preferences::login();
ttext_box* user_widget

2
src/gui/dialogs/mp_method_selection.hpp
View file

@ -48,7 +48,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/network_transmission.cpp
View file

@ -81,7 +81,7 @@ void tnetwork_transmission::set_subtitle(const std::string& subtitle)
subtitle_ = subtitle;
}
void tnetwork_transmission::pre_show(CVideo& /*video*/, twindow& window)
void tnetwork_transmission::pre_show(twindow& window)
{
// ***** ***** ***** ***** Set up the widgets ***** ***** ***** *****
if(!subtitle_.empty()) {

2
src/gui/dialogs/network_transmission.hpp
View file

@ -66,7 +66,7 @@ public:
protected:
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

4
src/gui/dialogs/popup.cpp
View file

@ -45,7 +45,7 @@ void tpopup::show(CVideo& video,
post_build(video, *window_);
pre_show(video, *window_);
pre_show(*window_);
if(allow_interaction) {
window_->show_non_modal();
@ -73,7 +73,7 @@ void tpopup::post_build(CVideo& /*video*/, twindow& /*window*/)
/* DO NOTHING */
}
void tpopup::pre_show(CVideo& /*video*/, twindow& /*window*/)
void tpopup::pre_show(twindow& /*window*/)
{
/* DO NOTHING */
}

2
src/gui/dialogs/popup.hpp
View file

@ -115,7 +115,7 @@ private:
* upon.
* @param window The window to be shown.
*/
virtual void pre_show(CVideo& video, twindow& window);
virtual void pre_show(twindow& window);
};
} // namespace gui2

2
src/gui/dialogs/preferences_dialog.cpp
View file

@ -1113,7 +1113,7 @@ static int index_in_pager_range(const int& first, const tstacked_widget& pager)
return std::min<int>(std::max(0, first), pager.get_layer_count() - 1);
}
void tpreferences::pre_show(CVideo& /*video*/, twindow& window)
void tpreferences::pre_show(twindow& window)
{
tlistbox& selector = find_widget<tlistbox>(&window, "selector", false);
tstacked_widget& pager = find_widget<tstacked_widget>(&window, "pager", false);

2
src/gui/dialogs/preferences_dialog.hpp
View file

@ -65,7 +65,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
void post_show(twindow& /*window*/);
/** Initializers */

2
src/gui/dialogs/screenshot_notification.cpp
View file

@ -79,7 +79,7 @@ tscreenshot_notification::tscreenshot_notification(const std::string& path)
false);
}
void tscreenshot_notification::pre_show(CVideo& /*video*/, twindow& window)
void tscreenshot_notification::pre_show(twindow& window)
{
ttext_box& path_box = find_widget<ttext_box>(&window, "path", false);
path_box.set_value(filesystem::base_name(path_));

2
src/gui/dialogs/screenshot_notification.hpp
View file

@ -50,7 +50,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
};
}

2
src/gui/dialogs/select_orb_colors.cpp
View file

@ -41,7 +41,7 @@ tselect_orb_colors::tselect_orb_colors()
{
}
void tselect_orb_colors::pre_show(CVideo&, twindow& window)
void tselect_orb_colors::pre_show(twindow& window)
{
setup_orb_group("unmoved", show_unmoved_, preferences::unmoved_color(), window);
setup_orb_group("partial", show_partial_, preferences::partial_color(), window);

2
src/gui/dialogs/select_orb_colors.hpp
View file

@ -46,7 +46,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);
};

2
src/gui/dialogs/simple_item_selector.cpp
View file

@ -79,7 +79,7 @@ tsimple_item_selector::tsimple_item_selector(const std::string& title,
register_label("message", true, message, message_uses_markup);
}
void tsimple_item_selector::pre_show(CVideo& /*video*/, twindow& window)
void tsimple_item_selector::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/simple_item_selector.hpp
View file

@ -91,7 +91,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/theme_list.cpp
View file

@ -57,7 +57,7 @@ ttheme_list::ttheme_list(const std::vector<theme_info>& themes, int selection)
{
}
void ttheme_list::pre_show(CVideo& /*video*/, twindow& window)
void ttheme_list::pre_show(twindow& window)
{
tlistbox& list = find_widget<tlistbox>(&window, "themes", false);
window.keyboard_capture(&list);

2
src/gui/dialogs/theme_list.hpp
View file

@ -52,7 +52,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

4
src/gui/dialogs/tip.cpp
View file

@ -101,10 +101,10 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tpopup. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
};
void ttip::pre_show(CVideo& /*video*/, twindow& window)
void ttip::pre_show(twindow& window)
{
find_widget<tcontrol>(&window, "label", false).set_label(message_);

6
src/gui/dialogs/title_screen.cpp
View file

@ -257,7 +257,7 @@ debug_tooltip(twindow& window, bool& handled, const tpoint& coordinate)
}
#endif
void ttitle_screen::pre_show(CVideo& video, twindow& window)
void ttitle_screen::pre_show(twindow& window)
{
set_restore(false);
window.set_click_dismiss(false);
@ -343,7 +343,7 @@ void ttitle_screen::pre_show(CVideo& video, twindow& window)
tbutton& about = find_widget<tbutton>(&window, "about", false);
connect_signal_mouse_left_click(
about,
boost::bind(&tgame_version::display, boost::ref(video)));
boost::bind(&tgame_version::display, boost::ref(window.video())));
/***** Set the clock button. *****/
tbutton& clock = find_widget<tbutton>(&window, "clock", false);
@ -354,7 +354,7 @@ void ttitle_screen::pre_show(CVideo& video, twindow& window)
clock,
boost::bind(&ttitle_screen::show_debug_clock_window,
this,
boost::ref(video)));
boost::ref(window.video())));
}
void ttitle_screen::update_tip(twindow& window, const bool previous)

2
src/gui/dialogs/title_screen.hpp
View file

@ -89,7 +89,7 @@ private:
virtual void post_build(CVideo& video, twindow& window);
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Holds the debug clock dialog. */
tpopup* debug_clock_;

2
src/gui/dialogs/transient_message.cpp
View file

@ -40,7 +40,7 @@ ttransient_message::ttransient_message(const std::string& title,
register_image("image", true, image);
}
void ttransient_message::pre_show(CVideo& /*video*/, twindow& window)
void ttransient_message::pre_show(twindow& window)
{
if(hide_title_) {
twidget& title = find_widget<twidget>(&window, "title", false);

2
src/gui/dialogs/transient_message.hpp
View file

@ -38,7 +38,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
virtual void pre_show(CVideo& video, twindow& window);
virtual void pre_show(twindow& window);
};
/**

2
src/gui/dialogs/unit_attack.cpp
View file

@ -267,7 +267,7 @@ void tunit_attack::damage_calc_callback(twindow& window)
predition_dialog.button_pressed(selection);
}
void tunit_attack::pre_show(CVideo& /*video*/, twindow& window)
void tunit_attack::pre_show(twindow& window)
{
connect_signal_mouse_left_click(
find_widget<tbutton>(&window, "attacker_profile", false),

2
src/gui/dialogs/unit_attack.hpp
View file

@ -43,7 +43,7 @@ private:
virtual const std::string& window_id() const;
/** Inherited from tdialog. */
void pre_show(CVideo& video, twindow& window);
void pre_show(twindow& window);
/** Inherited from tdialog. */
void post_show(twindow& window);

2
src/gui/dialogs/unit_create.cpp
View file

@ -90,7 +90,7 @@ tunit_create::tunit_create()
{
}
void tunit_create::pre_show(CVideo& /*video*/, twindow& window)
void tunit_create::pre_show(twindow& window)
{
ttoggle_button& male_toggle
= find_widget<ttoggle_button>(&window, "male_toggle", false);

Some files were not shown because too many files have changed in this diff Show more