Author: mordante
Date: Sun Sep 21 12:42:12 2008
New Revision: 29614
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29614&view=rev
Log:
Make set_label() virtual so tscroll_label works properly.
Modified:
trunk/src/gui/widgets/control.hpp
trunk/src/gui/widgets/scroll_label.hpp
Modified: trunk/src/gui/widgets/control.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.hpp?rev=29614&r1=29613&r2=29614&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.hpp (original)
+++ trunk/src/gui/widgets/control.hpp Sun Sep 21 12:42:12 2008
@@ -170,7 +170,7 @@
{ use_tooltip_on_label_overflow_ = use_tooltip; }
const t_string& label() const { return label_; }
- void set_label(const t_string& label);
+ virtual void set_label(const t_string& label);
const t_string& tooltip() const { return tooltip_; }
// Note setting the tooltip_ doesn't dirty an object.
Modified: trunk/src/gui/widgets/scroll_label.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/scroll_label.hpp?rev=29614&r1=29613&r2=29614&view=diff
==============================================================================
--- trunk/src/gui/widgets/scroll_label.hpp (original)
+++ trunk/src/gui/widgets/scroll_label.hpp Sun Sep 21 12:42:12 2008
@@ -41,7 +41,7 @@
/** Inherited from twidget. */
bool has_vertical_scrollbar() const { return true; }
- /** *OVERRIDDEN* from tcontrol */
+ /** Inherited from tcontrol. */
void set_label(const t_string& label);
/** Inherited from tcontainer_. */
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
