Mercurial > hg > toolkit / file diff

--- a/ui/gtk/menu.c	Thu May 15 22:13:25 2014 +0200
+++ b/ui/gtk/menu.c	Fri May 16 16:19:46 2014 +0200
@@ -245,7 +245,7 @@
     if(i->callback != NULL) {
         UiEventData *event = malloc(sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = i->userdata;
+        event->userdata = i->userdata;
         event->callback = i->callback;
         event->value = 0;
 
@@ -281,7 +281,7 @@
     if(i->callback != NULL) {
         UiEventData *event = malloc(sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = i->userdata;
+        event->userdata = i->userdata;
         event->callback = i->callback;
         event->value = 0;
 
@@ -323,7 +323,7 @@
     if(ci->callback) {
         UiEventData *event = malloc(sizeof(UiEventData));
         event->obj = obj;
-        event->user_data = ci->userdata;
+        event->userdata = ci->userdata;
         event->callback = ci->callback;
         event->value = 0;
 
@@ -413,7 +413,7 @@
             // TODO: use mempool
             UiEventData *event = malloc(sizeof(UiEventData));
             event->obj = list->object;
-            event->user_data = list->userdata;
+            event->userdata = list->userdata;
             event->callback = list->callback;
             event->value = i - 1;
 
@@ -443,7 +443,7 @@
     evt.document = event->obj->document;
     evt.eventdata = NULL;
     evt.intval = event->value;
-    event->callback(&evt, event->user_data);    
+    event->callback(&evt, event->userdata);    
 }
 
 void ui_menu_event_toggled(GtkCheckMenuItem *ci, UiEventData *event) {
@@ -453,7 +453,7 @@
     evt.document = event->obj->document;
     evt.eventdata = NULL;
     evt.intval = gtk_check_menu_item_get_active(ci);
-    event->callback(&evt, event->user_data);    
+    event->callback(&evt, event->userdata);    
 }
 
 int ui_checkitem_get(UiInteger *i) {