Author: mordante
Date: Sat Sep 13 10:23:47 2008
New Revision: 29432
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29432&view=rev
Log:
Let find_widget also test the grid id.
Modified:
trunk/src/gui/widgets/grid.cpp
Modified: trunk/src/gui/widgets/grid.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/grid.cpp?rev=29432&r1=29431&r2=29432&view=diff
==============================================================================
--- trunk/src/gui/widgets/grid.cpp (original)
+++ trunk/src/gui/widgets/grid.cpp Sat Sep 13 10:23:47 2008
@@ -322,10 +322,16 @@
twidget* tgrid::find_widget(const std::string& id, const bool must_be_active)
{
+ // Inherited.
+ twidget* widget = twidget::find_widget(id, must_be_active);
+ if(widget) {
+ return widget;
+ }
+
for(std::vector<tchild>::iterator itor = children_.begin();
itor != children_.end(); ++itor) {
- twidget* widget = itor->widget();
+ widget = itor->widget();
if(!widget) {
continue;
}
@@ -344,10 +350,16 @@
const twidget* tgrid::find_widget(const std::string& id,
const bool must_be_active) const
{
+ // Inherited.
+ const twidget* widget = twidget::find_widget(id, must_be_active);
+ if(widget) {
+ return widget;
+ }
+
for(std::vector<tchild>::const_iterator itor = children_.begin();
itor != children_.end(); ++itor) {
- const twidget* widget = itor->widget();
+ widget = itor->widget();
if(!widget) {
continue;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
