comparison: ui/gtk/menu.c
ui/gtk/menu.c
- changeset 659
- d6baaa93f7be
- parent 558
- 62aefa91ffc5
- child 797
- 47008843b468
equal
deleted
inserted
replaced
| 658:b25f54b51d76 | 659:d6baaa93f7be |
|---|---|
| 512 event->obj = obj; | 512 event->obj = obj; |
| 513 event->userdata = i->userdata; | 513 event->userdata = i->userdata; |
| 514 event->callback = i->callback; | 514 event->callback = i->callback; |
| 515 event->value = 0; | 515 event->value = 0; |
| 516 event->customdata = NULL; | 516 event->customdata = NULL; |
| 517 event->customint = 0; | |
| 517 | 518 |
| 518 g_signal_connect( | 519 g_signal_connect( |
| 519 action, | 520 action, |
| 520 "activate", | 521 "activate", |
| 521 G_CALLBACK(ui_activate_event_wrapper), | 522 G_CALLBACK(ui_activate_event_wrapper), |
| 611 UiEventData *event = malloc(sizeof(UiEventData)); | 612 UiEventData *event = malloc(sizeof(UiEventData)); |
| 612 event->obj = obj; | 613 event->obj = obj; |
| 613 event->userdata = il->userdata; | 614 event->userdata = il->userdata; |
| 614 event->callback = il->callback; | 615 event->callback = il->callback; |
| 615 event->customdata = var; | 616 event->customdata = var; |
| 617 event->customint = 0; | |
| 616 event->value = 0; | 618 event->value = 0; |
| 617 | 619 |
| 618 g_signal_connect( | 620 g_signal_connect( |
| 619 action, | 621 action, |
| 620 "activate", | 622 "activate", |
| 636 UiEvent evt; | 638 UiEvent evt; |
| 637 evt.obj = event->obj; | 639 evt.obj = event->obj; |
| 638 evt.window = event->obj->window; | 640 evt.window = event->obj->window; |
| 639 evt.document = event->obj->ctx->document; | 641 evt.document = event->obj->ctx->document; |
| 640 evt.eventdata = event->customdata; | 642 evt.eventdata = event->customdata; |
| 643 evt.eventdatatype = event->customint; | |
| 641 evt.intval = intval; | 644 evt.intval = intval; |
| 642 event->callback(&evt, event->userdata); | 645 event->callback(&evt, event->userdata); |
| 643 } | 646 } |
| 644 | 647 |
| 645 void ui_menu_list_item_activate_event_wrapper(GSimpleAction* self, GVariant* parameter, UiEventData *event) { | 648 void ui_menu_list_item_activate_event_wrapper(GSimpleAction* self, GVariant* parameter, UiEventData *event) { |
| 650 UiEvent evt; | 653 UiEvent evt; |
| 651 evt.obj = event->obj; | 654 evt.obj = event->obj; |
| 652 evt.window = event->obj->window; | 655 evt.window = event->obj->window; |
| 653 evt.document = event->obj->ctx->document; | 656 evt.document = event->obj->ctx->document; |
| 654 evt.eventdata = ui_list_get(list, index); | 657 evt.eventdata = ui_list_get(list, index); |
| 658 evt.eventdatatype = UI_EVENT_DATA_LIST_ELM; | |
| 655 evt.intval = index; | 659 evt.intval = index; |
| 656 event->callback(&evt, event->userdata); | 660 event->callback(&evt, event->userdata); |
| 657 | 661 |
| 658 } | 662 } |
| 659 | 663 |
