comparison: ui/common/toolbar.c
ui/common/toolbar.c
- changeset 823
- 1e1df80772ed
- parent 791
- c83b9acfa316
- child 836
- 5a8485ff7f54
equal
deleted
inserted
replaced
| 822:54e43e4efac2 | 823:1e1df80772ed |
|---|---|
| 53 static UiToolbarItemArgs itemargs_copy(UiToolbarItemArgs *args, size_t *ngroups) { | 53 static UiToolbarItemArgs itemargs_copy(UiToolbarItemArgs *args, size_t *ngroups) { |
| 54 UiToolbarItemArgs newargs; | 54 UiToolbarItemArgs newargs; |
| 55 newargs.label = nl_strdup(args->label); | 55 newargs.label = nl_strdup(args->label); |
| 56 newargs.stockid = nl_strdup(args->stockid); | 56 newargs.stockid = nl_strdup(args->stockid); |
| 57 newargs.icon = nl_strdup(args->icon); | 57 newargs.icon = nl_strdup(args->icon); |
| 58 newargs.tooltip = nl_strdup(args->tooltip); | |
| 58 newargs.onclick = args->onclick; | 59 newargs.onclick = args->onclick; |
| 59 newargs.onclickdata = args->onclickdata; | 60 newargs.onclickdata = args->onclickdata; |
| 60 newargs.groups = uic_copy_groups(args->groups, ngroups); | 61 newargs.groups = uic_copy_groups(args->groups, ngroups); |
| 61 return newargs; | 62 return newargs; |
| 62 } | 63 } |
| 72 static UiToolbarToggleItemArgs toggleitemargs_copy(UiToolbarToggleItemArgs *args, size_t *ngroups) { | 73 static UiToolbarToggleItemArgs toggleitemargs_copy(UiToolbarToggleItemArgs *args, size_t *ngroups) { |
| 73 UiToolbarToggleItemArgs newargs; | 74 UiToolbarToggleItemArgs newargs; |
| 74 newargs.label = nl_strdup(args->label); | 75 newargs.label = nl_strdup(args->label); |
| 75 newargs.stockid = nl_strdup(args->stockid); | 76 newargs.stockid = nl_strdup(args->stockid); |
| 76 newargs.icon = nl_strdup(args->icon); | 77 newargs.icon = nl_strdup(args->icon); |
| 78 newargs.tooltip = nl_strdup(args->tooltip); | |
| 77 newargs.varname = nl_strdup(args->varname); | 79 newargs.varname = nl_strdup(args->varname); |
| 78 newargs.onchange = args->onchange; | 80 newargs.onchange = args->onchange; |
| 79 newargs.onchangedata = args->onchangedata; | 81 newargs.onchangedata = args->onchangedata; |
| 80 newargs.groups = uic_copy_groups(args->groups, ngroups); | 82 newargs.groups = uic_copy_groups(args->groups, ngroups); |
| 81 return newargs; | 83 return newargs; |
| 91 static UiToolbarMenuArgs menuargs_copy(UiToolbarMenuArgs *args) { | 93 static UiToolbarMenuArgs menuargs_copy(UiToolbarMenuArgs *args) { |
| 92 UiToolbarMenuArgs newargs; | 94 UiToolbarMenuArgs newargs; |
| 93 newargs.label = nl_strdup(args->label); | 95 newargs.label = nl_strdup(args->label); |
| 94 newargs.stockid = nl_strdup(args->stockid); | 96 newargs.stockid = nl_strdup(args->stockid); |
| 95 newargs.icon = nl_strdup(args->icon); | 97 newargs.icon = nl_strdup(args->icon); |
| 98 newargs.tooltip = nl_strdup(args->tooltip); | |
| 96 return newargs; | 99 return newargs; |
| 97 } | 100 } |
| 98 | 101 |
| 99 UIEXPORT void ui_toolbar_menu_create(const char* name, UiToolbarMenuArgs *args) { | 102 UIEXPORT void ui_toolbar_menu_create(const char* name, UiToolbarMenuArgs *args) { |
| 100 UiToolbarMenuItem* item = malloc(sizeof(UiToolbarMenuItem)); | 103 UiToolbarMenuItem* item = malloc(sizeof(UiToolbarMenuItem)); |
