comparison: ui/ui/toolbar.h
ui/ui/toolbar.h
- branch
- newapi
- changeset 226
- 4eef1d49f794
- parent 207
- 93b9f502cb88
- child 233
- 84665f0a9ab2
equal
deleted
inserted
replaced
| 225:097f45f9c1fa | 226:4eef1d49f794 |
|---|---|
| 59 const char* label; | 59 const char* label; |
| 60 const char* stockid; | 60 const char* stockid; |
| 61 const char* icon; | 61 const char* icon; |
| 62 } UiToolbarMenuArgs; | 62 } UiToolbarMenuArgs; |
| 63 | 63 |
| 64 enum UiToolbarPos { | |
| 65 UI_TOOLBAR_LEFT = 0, | |
| 66 UI_TOOLBAR_CENTER, | |
| 67 UI_TOOLBAR_RIGHT | |
| 68 }; | |
| 64 | 69 |
| 65 #define ui_toolbar_item(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } ) | 70 #define ui_toolbar_item(name, ...) ui_toolbar_item_create(name, (UiToolbarItemArgs){ __VA_ARGS__ } ) |
| 66 #define ui_toolbar_toggleitem(name, ...) ui_toolbar_toggleitem_create(name, (UiToolbarToggleItemArgs){ __VA_ARGS__ } ) | 71 #define ui_toolbar_toggleitem(name, ...) ui_toolbar_toggleitem_create(name, (UiToolbarToggleItemArgs){ __VA_ARGS__ } ) |
| 67 | 72 |
| 68 #define ui_toolbar_menu(obj, ...) for(ui_toolbar_menu_create(obj, (UiToolbarMenuArgs){ __VA_ARGS__ });ui_menu_is_open();ui_menu_close()) | 73 #define ui_toolbar_menu(obj, ...) for(ui_toolbar_menu_create(obj, (UiToolbarMenuArgs){ __VA_ARGS__ });ui_menu_is_open();ui_menu_close()) |
| 87 | 92 |
| 88 void ui_toolbar_combobox_deprecated(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata); | 93 void ui_toolbar_combobox_deprecated(char *name, UiList *list, ui_getvaluefunc getvalue, ui_callback f, void *udata); |
| 89 void ui_toolbar_combobox_str_deprecated(char *name, UiList *list, ui_callback f, void *udata); | 94 void ui_toolbar_combobox_str_deprecated(char *name, UiList *list, ui_callback f, void *udata); |
| 90 void ui_toolbar_combobox_nv_deprecated(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata); | 95 void ui_toolbar_combobox_nv_deprecated(char *name, char *listname, ui_getvaluefunc getvalue, ui_callback f, void *udata); |
| 91 | 96 |
| 92 UIEXPORT void ui_toolbar_add_default(const char *name); | 97 UIEXPORT void ui_toolbar_add_default(const char *name, enum UiToolbarPos pos); |
| 93 | 98 |
| 94 | 99 |
| 95 | 100 |
| 96 #ifdef __cplusplus | 101 #ifdef __cplusplus |
| 97 } | 102 } |
