comparison: ui/gtk/list.c
ui/gtk/list.c
- changeset 643
- bed746b98a52
- parent 637
- 6a2c744fe042
- child 646
- c9538297b89a
equal
deleted
inserted
replaced
| 642:0cce9196c62c | 643:bed746b98a52 |
|---|---|
| 230 // to simplify things and share code with ui_table_create, we also | 230 // to simplify things and share code with ui_table_create, we also |
| 231 // use a UiModel for the listview | 231 // use a UiModel for the listview |
| 232 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); | 232 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); |
| 233 if(args->getvalue2) { | 233 if(args->getvalue2) { |
| 234 model->getvalue2 = args->getvalue2; | 234 model->getvalue2 = args->getvalue2; |
| 235 model->getvalue2data = args->getvalue2data; | |
| 235 } else if(args->getvalue) { | 236 } else if(args->getvalue) { |
| 236 model->getvalue = args->getvalue; | 237 model->getvalue = args->getvalue; |
| 237 } else { | 238 } else { |
| 238 model->getvalue = ui_strmodel_getvalue; | 239 model->getvalue = ui_strmodel_getvalue; |
| 239 } | 240 } |
| 319 // to simplify things and share code with ui_tableview_create, we also | 320 // to simplify things and share code with ui_tableview_create, we also |
| 320 // use a UiModel for the listview | 321 // use a UiModel for the listview |
| 321 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); | 322 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); |
| 322 if(args->getvalue2) { | 323 if(args->getvalue2) { |
| 323 model->getvalue2 = args->getvalue2; | 324 model->getvalue2 = args->getvalue2; |
| 325 model->getvalue2data = args->getvalue2data; | |
| 324 } else if(args->getvalue) { | 326 } else if(args->getvalue) { |
| 325 model->getvalue = args->getvalue; | 327 model->getvalue = args->getvalue; |
| 326 } else { | 328 } else { |
| 327 model->getvalue = ui_strmodel_getvalue; | 329 model->getvalue = ui_strmodel_getvalue; |
| 328 } | 330 } |
| 836 #endif | 838 #endif |
| 837 | 839 |
| 838 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); | 840 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); |
| 839 if(args->getvalue2) { | 841 if(args->getvalue2) { |
| 840 model->getvalue2 = args->getvalue2; | 842 model->getvalue2 = args->getvalue2; |
| 843 model->getvalue2data = args->getvalue2data; | |
| 841 } else if(args->getvalue) { | 844 } else if(args->getvalue) { |
| 842 model->getvalue = args->getvalue; | 845 model->getvalue = args->getvalue; |
| 843 } else { | 846 } else { |
| 844 model->getvalue = ui_strmodel_getvalue; | 847 model->getvalue = ui_strmodel_getvalue; |
| 845 } | 848 } |
| 1145 UiObject* current = uic_current_obj(obj); | 1148 UiObject* current = uic_current_obj(obj); |
| 1146 | 1149 |
| 1147 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); | 1150 UiModel *model = ui_model(obj->ctx, UI_STRING, "", -1); |
| 1148 if(args->getvalue2) { | 1151 if(args->getvalue2) { |
| 1149 model->getvalue2 = args->getvalue2; | 1152 model->getvalue2 = args->getvalue2; |
| 1153 model->getvalue2data = args->getvalue2data; | |
| 1150 } else if(args->getvalue) { | 1154 } else if(args->getvalue) { |
| 1151 model->getvalue = args->getvalue; | 1155 model->getvalue = args->getvalue; |
| 1152 } else { | 1156 } else { |
| 1153 model->getvalue = ui_strmodel_getvalue; | 1157 model->getvalue = ui_strmodel_getvalue; |
| 1154 } | 1158 } |
