comparison: ui/gtk/toolbar.c
ui/gtk/toolbar.c
- changeset 147
- 2e384acc89a6
- parent 146
- dd0ae1c62a72
- child 157
- 0b33b9396851
equal
deleted
inserted
replaced
| 146:dd0ae1c62a72 | 147:2e384acc89a6 |
|---|---|
| 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 UiModel *modelinfo = ui_model(obj->ctx, UI_STRING, "", -1); | 361 UiModel *modelinfo = ui_model(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(obj, 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(); |
| 367 gtk_container_add(GTK_CONTAINER(item), combobox); | 367 gtk_container_add(GTK_CONTAINER(item), combobox); |
| 368 gtk_toolbar_insert(tb, item, -1); | 368 gtk_toolbar_insert(tb, item, -1); |
| 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 UiModel *modelinfo = ui_model(obj->ctx, UI_STRING, "", -1); | 374 UiModel *modelinfo = ui_model(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(obj, 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(); |
| 380 gtk_container_add(GTK_CONTAINER(item), combobox); | 380 gtk_container_add(GTK_CONTAINER(item), combobox); |
| 381 gtk_toolbar_insert(tb, item, -1); | 381 gtk_toolbar_insert(tb, item, -1); |
