Mercurial > dwindows

comparison gtk3/dw.c @ 1881:653ccb517aa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix missing rowdata parameter in container enter callback on GTK3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 10 Aug 2013 06:57:00 +0000
parents fb137f7f91e4
children 71780cf68aa2
comparison
equal deleted inserted replaced
1880:6949c73e30fd 1881:653ccb517aa1
1563 { 1563 {
1564 /* Handle both key and button events together */ 1564 /* Handle both key and button events together */
1565 if((event->type == GDK_2BUTTON_PRESS && buttonevent->button == 1) || 1565 if((event->type == GDK_2BUTTON_PRESS && buttonevent->button == 1) ||
1566 (event->type == GDK_KEY_PRESS && keyevent->keyval == VK_RETURN)) 1566 (event->type == GDK_KEY_PRESS && keyevent->keyval == VK_RETURN))
1567 { 1567 {
1568 int (*contextfunc)(HWND, char *, void *) = work.func; 1568 int (*contextfunc)(HWND, char *, void *, void *) = work.func;
1569 char *text = NULL; 1569 char *text = NULL;
1570 void *data = NULL;
1570 1571
1571 /* Prevent some double events from happening */ 1572 /* Prevent some double events from happening */
1572 if(event->type == GDK_2BUTTON_PRESS) 1573 if(event->type == GDK_2BUTTON_PRESS)
1573 { 1574 {
1574 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(1)); 1575 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(1));
1587 1588
1588 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path)) 1589 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
1589 { 1590 {
1590 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)) 1591 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
1591 { 1592 {
1592 gtk_tree_model_get(store, &iter, 0, &text, -1); 1593 gtk_tree_model_get(store, &iter, 0, &text, 1, &data, -1);
1593 retval = contextfunc(work.window, text, work.data); 1594 retval = contextfunc(work.window, text, work.data, data);
1594 } 1595 }
1595 } 1596 }
1596 gtk_tree_path_free(path); 1597 gtk_tree_path_free(path);
1597 } 1598 }
1598 } 1599 }