Author: mordante
Date: Tue May 15 20:24:50 2012
New Revision: 54180
URL: http://svn.gna.org/viewcvs/wesnoth?rev=54180&view=rev
Log:
Fixes has_widget for grids.
This reapplies r54170 and resolves the issue found in r54174.
Modified:
trunk/src/gui/widgets/container.hpp
trunk/src/gui/widgets/grid.cpp
Modified: trunk/src/gui/widgets/container.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/container.hpp?rev=54180&r1=54179&r2=54180&view=diff
==============================================================================
--- trunk/src/gui/widgets/container.hpp (original)
+++ trunk/src/gui/widgets/container.hpp Tue May 15 20:24:50 2012
@@ -97,7 +97,7 @@
/** Inherited from twidget.*/
bool has_widget(const twidget* widget) const
- { return grid_.has_widget(widget); }
+ { return twidget::has_widget(widget) ||
grid_.has_widget(widget); }
/** Inherited from twidget. */
void set_origin(const tpoint& origin);
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=54180&r1=54179&r2=54180&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Tue May 15 20:24:50 2012
@@ -627,8 +627,12 @@
bool tgrid::has_widget(const twidget* widget) const
{
+ if(twidget::has_widget(widget)) {
+ return true;
+ }
+
foreach(const tchild& child, children_) {
- if(child.widget() == /*->has_widget*/(widget)) {
+ if(child.widget()->has_widget(widget)) {
return true;
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
