comparison: ui/gtk/list.c
ui/gtk/list.c
- changeset 680
- a4795b40e679
- parent 669
- 5b930e8c3a87
- child 683
- ba226c243f3f
equal
deleted
inserted
replaced
| 679:bdc3f59b21ca | 680:a4795b40e679 |
|---|---|
| 919 GTK_POLICY_AUTOMATIC, | 919 GTK_POLICY_AUTOMATIC, |
| 920 GTK_POLICY_AUTOMATIC); // GTK_POLICY_ALWAYS | 920 GTK_POLICY_AUTOMATIC); // GTK_POLICY_ALWAYS |
| 921 SCROLLEDWINDOW_SET_CHILD(scroll_area, view); | 921 SCROLLEDWINDOW_SET_CHILD(scroll_area, view); |
| 922 | 922 |
| 923 UI_APPLY_LAYOUT2(current, args); | 923 UI_APPLY_LAYOUT2(current, args); |
| 924 current->container->add(current->container, scroll_area, FALSE); | 924 current->container->add(current->container, scroll_area); |
| 925 | 925 |
| 926 // ct->current should point to view, not scroll_area, to make it possible | 926 // ct->current should point to view, not scroll_area, to make it possible |
| 927 // to add a context menu | 927 // to add a context menu |
| 928 current->container->current = view; | 928 current->container->current = view; |
| 929 | 929 |
| 1096 ui_widget_set_contextmenu(view, menu); | 1096 ui_widget_set_contextmenu(view, menu); |
| 1097 #endif | 1097 #endif |
| 1098 } | 1098 } |
| 1099 | 1099 |
| 1100 UI_APPLY_LAYOUT2(current, args); | 1100 UI_APPLY_LAYOUT2(current, args); |
| 1101 current->container->add(current->container, scroll_area, FALSE); | 1101 current->container->add(current->container, scroll_area); |
| 1102 | 1102 |
| 1103 // ct->current should point to view, not scroll_area, to make it possible | 1103 // ct->current should point to view, not scroll_area, to make it possible |
| 1104 // to add a context menu | 1104 // to add a context menu |
| 1105 current->container->current = view; | 1105 current->container->current = view; |
| 1106 | 1106 |
| 1164 | 1164 |
| 1165 GtkWidget *combobox = ui_create_combobox(obj, model, var, args->static_elements, args->static_nelm, args->onactivate, args->onactivatedata); | 1165 GtkWidget *combobox = ui_create_combobox(obj, model, var, args->static_elements, args->static_nelm, args->onactivate, args->onactivatedata); |
| 1166 ui_set_name_and_style(combobox, args->name, args->style_class); | 1166 ui_set_name_and_style(combobox, args->name, args->style_class); |
| 1167 ui_set_widget_groups(obj->ctx, combobox, args->groups); | 1167 ui_set_widget_groups(obj->ctx, combobox, args->groups); |
| 1168 UI_APPLY_LAYOUT2(current, args); | 1168 UI_APPLY_LAYOUT2(current, args); |
| 1169 current->container->add(current->container, combobox, FALSE); | 1169 current->container->add(current->container, combobox); |
| 1170 current->container->current = combobox; | 1170 current->container->current = combobox; |
| 1171 return combobox; | 1171 return combobox; |
| 1172 } | 1172 } |
| 1173 | 1173 |
| 1174 GtkWidget* ui_create_combobox(UiObject *obj, UiModel *model, UiVar *var, char **elm, size_t nelm, ui_callback f, void *udata) { | 1174 GtkWidget* ui_create_combobox(UiObject *obj, UiModel *model, UiVar *var, char **elm, size_t nelm, ui_callback f, void *udata) { |
