From 6565e9511b2a7816ca24dd170cb3a0fa554ec09c Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Fri, 17 Dec 2010 02:39:06 +0000 Subject: update menu control. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1207 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/rtgui/include/rtgui/widgets/menu.h | 34 ++++++++++++++++----------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'components/rtgui/include') diff --git a/components/rtgui/include/rtgui/widgets/menu.h b/components/rtgui/include/rtgui/widgets/menu.h index 1d98f32e51..dcfa33ffaa 100644 --- a/components/rtgui/include/rtgui/widgets/menu.h +++ b/components/rtgui/include/rtgui/widgets/menu.h @@ -1,6 +1,6 @@ #ifndef __RTGUI_MENU_H__ #define __RTGUI_MENU_H__ - +:q #include #include #include @@ -23,14 +23,24 @@ struct rtgui_menu_item const char* label; /* menu image */ rtgui_image_t *image; - /* parent menu */ - struct rtgui_menu *parent_menu, *sub_menu; + + /* sub-menu item */ + const struct rtgui_menu_item_t *submenu; + rt_uint16_t submenu_count; /* menu action */ rt_bool_t (*on_menuaction)(rtgui_widget_t* widget, rtgui_event_t* event); }; typedef struct rtgui_menu_item rtgui_menu_item_t; +rtgui_menu_item_t items[] = +{ + {RTGUI_ITEM_NORMAL, "item #1", RT_NULL, RT_NULL, 0, RT_NULL}, + {RTGUI_ITEM_NORMAL, "item #2", RT_NULL, RT_NULL, 0, RT_NULL}, + {RTGUI_ITEM_SEPARATOR, RT_NULL, RT_NULL, RT_NULL, 0, RT_NULL}, + {RTGUI_ITEM_NORMAL, "item #3", RT_NULL, RT_NULL, 0, RT_NULL}, +}; + /** Gets the type of a menu */ #define RTGUI_MENU_TYPE (rtgui_menu_type_get()) /** Casts the object to an rtgui_menu */ @@ -39,9 +49,6 @@ typedef struct rtgui_menu_item rtgui_menu_item_t; #define RTGUI_IS_MENU(obj) (RTGUI_OBJECT_CHECK_TYPE((obj), RTGUI_MENU_TYPE)) #define RTGUI_MENU_DEFAULT_WIDTH 100 - -struct rtgui_menu_item; - struct rtgui_menu { /* inherited from window */ @@ -52,8 +59,10 @@ struct rtgui_menu rt_uint16_t items_count; rt_uint16_t current_item; - /* parent item */ - struct rtgui_menu_item *parent_item; + /* parent menu */ + struct rtgui_menu *parent_menu; + /* menu item list control */ + struct rtgui_listctrl *items_list; /* pop event handle */ rt_bool_t (*on_menupop)(rtgui_widget_t* widget, rtgui_event_t* event); @@ -63,17 +72,14 @@ typedef struct rtgui_menu rtgui_menu_t; rtgui_type_t *rtgui_menu_type_get(void); -struct rtgui_menu* rtgui_menu_create(const char* title); +struct rtgui_menu* rtgui_menu_create(const char* title, struct rtgui_menu* parent_menu, + const struct rtgui_menu_item* items, rt_uint16_t count); void rtgui_menu_destroy(struct rtgui_menu* menu); void rtgui_menu_set_onmenupop(struct rtgui_menu* menu, rtgui_event_handler_ptr handler); void rtgui_menu_set_onmenuhide(struct rtgui_menu* menu, rtgui_event_handler_ptr handler); void rtgui_menu_pop(struct rtgui_menu* menu, int x, int y); -rtgui_menu_item_t* rtgui_menu_item_new(struct rtgui_menu* menu, char* text, int type, - rt_bool_t (*on_menu)(rtgui_widget_t* widget, rtgui_event_t* event)); -rtgui_menu_item_t* rtgui_menu_item_new_separator(struct rtgui_menu* menu); -void rtgui_menu_item_add(struct rtgui_menu* menu, struct rtgui_menu_item* item); -struct rtgui_menu_item* rtgui_menu_get_first_item(struct rtgui_menu* menu); #endif + -- cgit v1.3.1