comparison: ui/gtk/toolbar.c
ui/gtk/toolbar.c
- changeset 142
- 46448d38885c
- parent 140
- c03c338a7dcf
- child 146
- dd0ae1c62a72
equal
deleted
inserted
replaced
| 141:cc2170ea05ad | 142:46448d38885c |
|---|---|
| 157 | 157 |
| 158 | 158 |
| 159 void ui_toolbar_combobox( | 159 void ui_toolbar_combobox( |
| 160 char *name, | 160 char *name, |
| 161 UiList *list, | 161 UiList *list, |
| 162 ui_model_getvalue_f getvalue, | 162 ui_getvaluefunc getvalue, |
| 163 ui_callback f, | 163 ui_callback f, |
| 164 void *udata) | 164 void *udata) |
| 165 { | 165 { |
| 166 UiToolbarComboBox *cb = malloc(sizeof(UiToolbarComboBox)); | 166 UiToolbarComboBox *cb = malloc(sizeof(UiToolbarComboBox)); |
| 167 cb->item.add_to = (ui_toolbar_add_f)add_toolbar_combobox; | 167 cb->item.add_to = (ui_toolbar_add_f)add_toolbar_combobox; |
| 186 } | 186 } |
| 187 | 187 |
| 188 void ui_toolbar_combobox_nv( | 188 void ui_toolbar_combobox_nv( |
| 189 char *name, | 189 char *name, |
| 190 char *listname, | 190 char *listname, |
| 191 ui_model_getvalue_f getvalue, | 191 ui_getvaluefunc getvalue, |
| 192 ui_callback f, | 192 ui_callback f, |
| 193 void *udata) | 193 void *udata) |
| 194 { | 194 { |
| 195 UiToolbarComboBoxNV *cb = malloc(sizeof(UiToolbarComboBoxNV)); | 195 UiToolbarComboBoxNV *cb = malloc(sizeof(UiToolbarComboBoxNV)); |
| 196 cb->item.add_to = (ui_toolbar_add_f)add_toolbar_combobox_nv; | 196 cb->item.add_to = (ui_toolbar_add_f)add_toolbar_combobox_nv; |
| 356 uic_add_group_widget(obj->ctx, button, item->groups); | 356 uic_add_group_widget(obj->ctx, button, item->groups); |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 | 359 |
| 360 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj) { | 360 void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj) { |
| 361 UiModelInfo *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1); | 361 UiModel *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1); |
| 362 modelinfo->getvalue = cb->getvalue; | 362 modelinfo->getvalue = cb->getvalue; |
| 363 UiListModel *model = ui_list_model_new(cb->var, modelinfo); | 363 UiListModel *model = ui_list_model_new(cb->var, modelinfo); |
| 364 | 364 |
| 365 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata); | 365 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata); |
| 366 GtkToolItem *item = gtk_tool_item_new(); | 366 GtkToolItem *item = gtk_tool_item_new(); |
| 369 } | 369 } |
| 370 | 370 |
| 371 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj) { | 371 void add_toolbar_combobox_nv(GtkToolbar *tb, UiToolbarComboBoxNV *cb, UiObject *obj) { |
| 372 UiVar *var = uic_create_var(obj->ctx, cb->listname, UI_VAR_LIST); | 372 UiVar *var = uic_create_var(obj->ctx, cb->listname, UI_VAR_LIST); |
| 373 if(var) { | 373 if(var) { |
| 374 UiModelInfo *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1); | 374 UiModel *modelinfo = ui_model_info(obj->ctx, UI_STRING, "", -1); |
| 375 modelinfo->getvalue = cb->getvalue; | 375 modelinfo->getvalue = cb->getvalue; |
| 376 UiListModel *model = ui_list_model_new(var, modelinfo); | 376 UiListModel *model = ui_list_model_new(var, modelinfo); |
| 377 | 377 |
| 378 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata); | 378 GtkWidget *combobox = ui_create_combobox(obj, model, cb->callback, cb->userdata); |
| 379 GtkToolItem *item = gtk_tool_item_new(); | 379 GtkToolItem *item = gtk_tool_item_new(); |
