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

Fix a bug in the new tcontrol constructor.

Browse source 
The constructor called a virtual function in it's constructor, which is
not a good idea, even worse it was pure virtual in the control class.
This commit is contained in:
Mark de Wever 2012-05-19 08:46:20 +00:00
parent 77e6286c0a
commit 283653b31b
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/widgets/control.cpp
View file

@ -76,7 +76,8 @@ tcontrol::tcontrol(const unsigned canvas_count)
tcontrol::tcontrol(
const implementation::tbuilder_control& builder
, const unsigned canvas_count)
, const unsigned canvas_count
, const std::string& control_type)
: twidget(builder)
, definition_(builder.definition)
, label_(builder.label)
@ -91,7 +92,7 @@ tcontrol::tcontrol(
, text_alignment_(PANGO_ALIGN_LEFT)
, shrunken_(false)
{
definition_load_configuration();
definition_load_configuration(control_type);
connect_signal<event::SHOW_TOOLTIP>(boost::bind(
&tcontrol::signal_handler_show_tooltip
@ -282,7 +283,7 @@ void tcontrol::load_config()
{
if(!config()) {
definition_load_configuration();
definition_load_configuration(get_control_type());
load_config_extra();
}
@ -396,11 +397,11 @@ void tcontrol::impl_draw_background(
, calculate_blitting_rectangle(x_offset, y_offset));
}
void tcontrol::definition_load_configuration()
void tcontrol::definition_load_configuration(const std::string& control_type)
{
assert(!config());
set_config(get_control(get_control_type(), definition_));
set_config(get_control(control_type, definition_));
assert(canvas().size() == config()->state.size());
for(size_t i = 0; i < canvas().size(); ++i) {

5
src/gui/widgets/control.hpp
View file

@ -45,7 +45,8 @@ public:
*/
tcontrol(
const implementation::tbuilder_control& builder
, const unsigned canvas_count);
, const unsigned canvas_count
, const std::string& control_type);
/**
* Sets the members of the control.
@ -360,7 +361,7 @@ private:
* loaded. The member definition_ contains the name of the definition and
* function load the proper configuration.
*/
void definition_load_configuration();
void definition_load_configuration(const std::string& control_type);
public:
/**