comparison: ui/gtk/menu.c
ui/gtk/menu.c
- branch
- newapi
- changeset 278
- a8faf8757450
- parent 275
- 132c7bcc6997
equal
deleted
inserted
replaced
| 277:5099a34747c4 | 278:a8faf8757450 |
|---|---|
| 107 UiEventData *event = malloc(sizeof(UiEventData)); | 107 UiEventData *event = malloc(sizeof(UiEventData)); |
| 108 event->obj = obj; | 108 event->obj = obj; |
| 109 event->userdata = i->userdata; | 109 event->userdata = i->userdata; |
| 110 event->callback = i->callback; | 110 event->callback = i->callback; |
| 111 event->value = 0; | 111 event->value = 0; |
| 112 event->customdata = NULL; | |
| 112 | 113 |
| 113 g_signal_connect( | 114 g_signal_connect( |
| 114 widget, | 115 widget, |
| 115 "activate", | 116 "activate", |
| 116 G_CALLBACK(ui_menu_event_wrapper), | 117 G_CALLBACK(ui_menu_event_wrapper), |
| 190 UiEventData *event = malloc(sizeof(UiEventData)); | 191 UiEventData *event = malloc(sizeof(UiEventData)); |
| 191 event->obj = obj; | 192 event->obj = obj; |
| 192 event->userdata = ci->userdata; | 193 event->userdata = ci->userdata; |
| 193 event->callback = ci->callback; | 194 event->callback = ci->callback; |
| 194 event->value = 0; | 195 event->value = 0; |
| 195 | 196 event->customdata = NULL; |
| 197 | |
| 196 g_signal_connect( | 198 g_signal_connect( |
| 197 widget, | 199 widget, |
| 198 "toggled", | 200 "toggled", |
| 199 G_CALLBACK(ui_menu_event_toggled), | 201 G_CALLBACK(ui_menu_event_toggled), |
| 200 event); | 202 event); |
| 289 UiEventData *event = malloc(sizeof(UiEventData)); | 291 UiEventData *event = malloc(sizeof(UiEventData)); |
| 290 event->obj = list->object; | 292 event->obj = list->object; |
| 291 event->userdata = list->userdata; | 293 event->userdata = list->userdata; |
| 292 event->callback = list->callback; | 294 event->callback = list->callback; |
| 293 event->value = i - 1; | 295 event->value = i - 1; |
| 296 event->customdata = NULL; | |
| 294 | 297 |
| 295 g_signal_connect( | 298 g_signal_connect( |
| 296 widget, | 299 widget, |
| 297 "activate", | 300 "activate", |
| 298 G_CALLBACK(ui_menu_event_wrapper), | 301 G_CALLBACK(ui_menu_event_wrapper), |
| 413 UiEventData *event = malloc(sizeof(UiEventData)); | 416 UiEventData *event = malloc(sizeof(UiEventData)); |
| 414 event->obj = obj; | 417 event->obj = obj; |
| 415 event->userdata = userdata; | 418 event->userdata = userdata; |
| 416 event->callback = f; | 419 event->callback = f; |
| 417 event->value = 0; | 420 event->value = 0; |
| 421 event->customdata = NULL; | |
| 418 | 422 |
| 419 g_signal_connect( | 423 g_signal_connect( |
| 420 widget, | 424 widget, |
| 421 "activate", | 425 "activate", |
| 422 G_CALLBACK(ui_menu_event_wrapper), | 426 G_CALLBACK(ui_menu_event_wrapper), |
| 467 UiEventData *event = malloc(sizeof(UiEventData)); | 471 UiEventData *event = malloc(sizeof(UiEventData)); |
| 468 event->obj = obj; | 472 event->obj = obj; |
| 469 event->userdata = userdata; | 473 event->userdata = userdata; |
| 470 event->callback = f; | 474 event->callback = f; |
| 471 event->value = 0; | 475 event->value = 0; |
| 476 event->customdata = NULL; | |
| 472 | 477 |
| 473 g_signal_connect( | 478 g_signal_connect( |
| 474 widget, | 479 widget, |
| 475 "activate", | 480 "activate", |
| 476 G_CALLBACK(ui_menu_event_wrapper), | 481 G_CALLBACK(ui_menu_event_wrapper), |
