comparison: ui/gtk/menu.c
ui/gtk/menu.c
- changeset 1108
- 2c8ab8c17da7
- parent 1107
- 22d58a28fea7
equal
deleted
inserted
replaced
| 1107:22d58a28fea7 | 1108:2c8ab8c17da7 |
|---|---|
| 342 } | 342 } |
| 343 | 343 |
| 344 ui_getvaluefunc2 getvalue = list->getvalue; | 344 ui_getvaluefunc2 getvalue = list->getvalue; |
| 345 void *getvaluedata = list->getvaluedata; | 345 void *getvaluedata = list->getvaluedata; |
| 346 int i = 1; | 346 int i = 1; |
| 347 int row = 0; | |
| 347 while(elm) { | 348 while(elm) { |
| 348 UiBool freeResult = FALSE; | 349 UiBool freeResult = FALSE; |
| 349 char *label = (char*) (getvalue ? getvalue(ls, elm, i, 0, getvaluedata, &freeResult) : elm); | 350 char *label = (char*) (getvalue ? getvalue(ls, elm, row, 0, getvaluedata, &freeResult) : elm); |
| 350 | 351 |
| 351 GtkWidget *widget = gtk_menu_item_new_with_label(label); | 352 GtkWidget *widget = gtk_menu_item_new_with_label(label); |
| 352 gtk_menu_shell_insert(list->menu, widget, list->index + i); | 353 gtk_menu_shell_insert(list->menu, widget, list->index + i); |
| 353 gtk_widget_show(widget); | 354 gtk_widget_show(widget); |
| 354 | 355 |
| 373 event); | 374 event); |
| 374 } | 375 } |
| 375 | 376 |
| 376 elm = ui_list_next(ls); | 377 elm = ui_list_next(ls); |
| 377 i++; | 378 i++; |
| 379 row++; | |
| 378 | 380 |
| 379 if(freeResult) { | 381 if(freeResult) { |
| 380 free(label); | 382 free(label); |
| 381 } | 383 } |
| 382 } | 384 } |
