Author: mordante
Date: Sat Sep 13 10:23:11 2008
New Revision: 29429
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29429&view=rev
Log:
Convert some more functions to use get_parent<T>().
Modified:
trunk/src/gui/widgets/listbox.cpp
trunk/src/gui/widgets/menubar.cpp
Modified: trunk/src/gui/widgets/listbox.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/listbox.cpp?rev=29429&r1=29428&r2=29429&view=diff
==============================================================================
--- trunk/src/gui/widgets/listbox.cpp (original)
+++ trunk/src/gui/widgets/listbox.cpp Sat Sep 13 10:23:11 2008
@@ -46,21 +46,9 @@
namespace gui2 {
-static tlistbox* get_listbox(twidget* widget)
-{
- do {
- widget = widget->parent();
-
- } while (widget && !dynamic_cast<tlistbox*>(widget));
-
- tlistbox* listbox = dynamic_cast<tlistbox*>(widget);
- assert(listbox);
- return listbox;
-}
-
static void callback_select_list_item(twidget* caller)
{
- get_listbox(caller)->list_item_selected(caller);
+ get_parent<tlistbox>(caller)->list_item_selected(caller);
}
tlistbox::tlistbox() :
Modified: trunk/src/gui/widgets/menubar.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/menubar.cpp?rev=29429&r1=29428&r2=29429&view=diff
==============================================================================
--- trunk/src/gui/widgets/menubar.cpp (original)
+++ trunk/src/gui/widgets/menubar.cpp Sat Sep 13 10:23:11 2008
@@ -41,21 +41,9 @@
namespace gui2 {
-static tmenubar* get_menubar(twidget* widget)
-{
- do {
- widget = widget->parent();
-
- } while (widget && !dynamic_cast<tmenubar*>(widget));
-
- tmenubar* menubar = dynamic_cast<tmenubar*>(widget);
- assert(menubar);
- return menubar;
-}
-
static void callback_select_item(twidget* caller)
{
- get_menubar(caller)->item_selected(caller);
+ get_parent<tmenubar>(caller)->item_selected(caller);
}
size_t tmenubar::get_item_count() const
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
