From 92a50c838d8ca2ae4027fd77b71db12fb52d86e3 Mon Sep 17 00:00:00 2001 From: "chaos.proton@gmail.com" Date: Fri, 20 Jul 2012 12:37:56 +0000 Subject: sync with RTGUI c074ff2898b9e Full log is in GitHub. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2222 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/rtgui/widgets/menu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'components/rtgui/widgets/menu.c') diff --git a/components/rtgui/widgets/menu.c b/components/rtgui/widgets/menu.c index c56041db83..6ff278f71c 100644 --- a/components/rtgui/widgets/menu.c +++ b/components/rtgui/widgets/menu.c @@ -40,10 +40,12 @@ static void _rtgui_menu_destructor(rtgui_menu_t* menu) static rt_bool_t _rtgui_menu_onitem(struct rtgui_object* object, struct rtgui_event* event) { struct rtgui_menu* menu; - RTGUI_WIDGET_EVENT_HANDLER_PREPARE + + /* event will be NULL, don't check it. */ + RT_ASSERT(object); /* get menu */ - menu = RTGUI_MENU(rtgui_widget_get_toplevel(widget)); + menu = RTGUI_MENU(rtgui_widget_get_toplevel(RTGUI_WIDGET(object))); if (menu->items[menu->items_list->current_item].type == RTGUI_ITEM_SUBMENU) { const rtgui_menu_item_t* items; @@ -84,7 +86,7 @@ static rt_bool_t _rtgui_menu_onitem(struct rtgui_object* object, struct rtgui_ev { /* invoke action */ if (menu->items[menu->items_list->current_item].on_menuaction != RT_NULL) - menu->items[menu->items_list->current_item].on_menuaction(RTGUI_WIDGET(menu), RT_NULL); + menu->items[menu->items_list->current_item].on_menuaction(RTGUI_OBJECT(menu), RT_NULL); /* hide sub-menu */ if (menu->sub_menu != RT_NULL) -- cgit v1.3.1