comparison: ui/ui/toolbar.h
ui/ui/toolbar.h
- branch
- newapi
- changeset 207
- 93b9f502cb88
- parent 205
- b1ac0dd1d38b
- child 226
- 4eef1d49f794
equal
deleted
inserted
replaced
| 206:7ebc5a747c6f | 207:93b9f502cb88 |
|---|---|
| 53 const char* varname; | 53 const char* varname; |
| 54 ui_callback onchange; | 54 ui_callback onchange; |
| 55 void* onchangedata; | 55 void* onchangedata; |
| 56 } UiToolbarToggleItemArgs; | 56 } UiToolbarToggleItemArgs; |
| 57 | 57 |
| 58 typedef struct UiToolbarMenuArgs { | |
| 59 const char* label; | |
| 60 const char* stockid; | |
| 61 const char* icon; | |
| 62 } UiToolbarMenuArgs; | |
| 63 | |
| 58 | 64 |
| 59 #define ui_toolbar_item(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } ) | 65 #define ui_toolbar_item(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } ) |
| 60 #define ui_toolbar_toggleitem(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } ) | 66 #define ui_toolbar_toggleitem(name, ...) ui_toolbar_toggleitem_create(name, (UiToolbarToggleItemArgs){ __VA_ARGS__ } ) |
| 67 | |
| 68 #define ui_toolbar_menu(obj, ...) for(ui_toolbar_menu_create(obj, (UiToolbarMenuArgs){ __VA_ARGS__ });ui_menu_is_open();ui_menu_close()) | |
| 69 | |
| 61 | 70 |
| 62 UIEXPORT void ui_toolbar_item_create(const char* name, UiToolbarItemArgs args); | 71 UIEXPORT void ui_toolbar_item_create(const char* name, UiToolbarItemArgs args); |
| 63 UIEXPORT void ui_toolbar_toggleitem_create(const char* name, UiToolbarToggleItemArgs args); | 72 UIEXPORT void ui_toolbar_toggleitem_create(const char* name, UiToolbarToggleItemArgs args); |
| 64 | 73 UIEXPORT void ui_toolbar_menu_create(const char* name, UiToolbarMenuArgs args); |
| 65 | 74 |
| 66 | 75 |
| 67 void ui_toolitem_deprecated(char *name, char *label, ui_callback f, void *udata); | 76 void ui_toolitem_deprecated(char *name, char *label, ui_callback f, void *udata); |
| 68 void ui_toolitem_st(char *name, char *stockid, ui_callback f, void *udata); | 77 void ui_toolitem_st(char *name, char *stockid, ui_callback f, void *udata); |
| 69 void ui_toolitem_sti(char *name, char *stockid, ui_callback f, void *udata); | 78 void ui_toolitem_sti(char *name, char *stockid, ui_callback f, void *udata); |
| 70 void ui_toolitem_stgr(char *name, char *stockid, ui_callback f, void *udata, ...); | 79 void ui_toolitem_stgr(char *name, char *stockid, ui_callback f, void *udata, ...); |
| 71 void ui_toolitem_stgri(char *name, char *stockid, ui_callback f, void *userdata, ...); | 80 void ui_toolitem_stgri(char *name, char *stockid, ui_callback f, void *userdata, ...); |
| 72 void ui_toolitem_img(char *name, char *label, char *img, ui_callback f, void *udata); | 81 void ui_toolitem_img(char *name, char *label, char *img, ui_callback f, void *udata); |
| 73 | 82 |
| 74 void ui_toolitem_toggle(const char *name, const char *label, const char *img, UiInteger *i); | 83 void ui_toolitem_toggle(const char *name, const char *label, const char *img, UiInteger *i); |
| 75 void ui_toolitem_toggle_st(const char *name, const char *stockid, UiInteger *i); | 84 void ui_toolitem_toggle_st_deprecated(const char *name, const char *stockid, UiInteger *i); |
| 76 void ui_toolitem_toggle_nv(const char *name, const char *label, const char *img, const char *intvar); | 85 void ui_toolitem_toggle_nv_deprecated(const char *name, const char *label, const char *img, const char *intvar); |
| 77 void ui_toolitem_toggle_stnv(const char *name, const char *stockid, const char *intvar); | 86 void ui_toolitem_toggle_stnv_deprecated(const char *name, const char *stockid, const char *intvar); |
| 78 | 87 |
| 79 void ui_toolbar_combobox(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata); | 88 void ui_toolbar_combobox_deprecated(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata); |
| 80 void ui_toolbar_combobox_str(char *name, UiList *list, ui_callback f, void *udata); | 89 void ui_toolbar_combobox_str_deprecated(char *name, UiList *list, ui_callback f, void *udata); |
| 81 void ui_toolbar_combobox_nv(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata); | 90 void ui_toolbar_combobox_nv_deprecated(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata); |
| 82 | 91 |
| 83 UIEXPORT void ui_toolbar_add_default(const char *name); | 92 UIEXPORT void ui_toolbar_add_default(const char *name); |
| 93 | |
| 94 | |
| 84 | 95 |
| 85 #ifdef __cplusplus | 96 #ifdef __cplusplus |
| 86 } | 97 } |
| 87 #endif | 98 #endif |
| 88 | 99 |
