AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

flowbox: Update to using GdkEvent API

Browse Source
This commit is contained in:
Carlos Garnacho 2017-08-25 16:46:15 +02:00
parent c48a196d77
commit e67090df91
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkflowbox.c
View File

@ -2617,11 +2617,14 @@ gtk_flow_box_enter_notify_event (GtkWidget *widget,
{ {
GtkFlowBox *box = GTK_FLOW_BOX (widget); GtkFlowBox *box = GTK_FLOW_BOX (widget);
GtkFlowBoxChild *child; GtkFlowBoxChild *child;
gdouble x, y;
if (event->window != gtk_widget_get_window (GTK_WIDGET (box))) if ((gdk_event_get_window ((GdkEvent *) event) !=
return FALSE; gtk_widget_get_window (GTK_WIDGET (box))) ||
gdk_event_get_coords ((GdkEvent *) event, &x, &y))
return GDK_EVENT_PROPAGATE;
child = gtk_flow_box_get_child_at_pos (box, event->x, event->y); child = gtk_flow_box_get_child_at_pos (box, x, y);
gtk_flow_box_update_active (box, child); gtk_flow_box_update_active (box, child);
return FALSE; return FALSE;
@ -2633,14 +2636,16 @@ gtk_flow_box_leave_notify_event (GtkWidget *widget,
{ {
GtkFlowBox *box = GTK_FLOW_BOX (widget); GtkFlowBox *box = GTK_FLOW_BOX (widget);
GtkFlowBoxChild *child = NULL; GtkFlowBoxChild *child = NULL;
gdouble x, y;
if (event->window != gtk_widget_get_window (GTK_WIDGET (box))) if (gdk_event_get_window ((GdkEvent *) event) !=
gtk_widget_get_window (GTK_WIDGET (box)))
return FALSE; return FALSE;
if (event->detail != GDK_NOTIFY_INFERIOR) if (event->detail != GDK_NOTIFY_INFERIOR)
child = NULL; child = NULL;
else else if (gdk_event_get_coords ((GdkEvent *) event, &x, &y))
child = gtk_flow_box_get_child_at_pos (box, event->x, event->y); child = gtk_flow_box_get_child_at_pos (box, x, y);
gtk_flow_box_update_active (box, child); gtk_flow_box_update_active (box, child);
@ -2704,8 +2709,12 @@ gtk_flow_box_motion_notify_event (GtkWidget *widget,
{ {
GtkFlowBox *box = GTK_FLOW_BOX (widget); GtkFlowBox *box = GTK_FLOW_BOX (widget);
GtkFlowBoxChild *child; GtkFlowBoxChild *child;
gdouble x, y;
child = gtk_flow_box_get_child_at_pos (box, event->x, event->y); if (!gdk_event_get_coords ((GdkEvent *) event, &x, &y))
return GDK_EVENT_PROPAGATE;
child = gtk_flow_box_get_child_at_pos (box, x, y);
gtk_flow_box_update_active (box, child); gtk_flow_box_update_active (box, child);
return GTK_WIDGET_CLASS (gtk_flow_box_parent_class)->motion_notify_event (widget, event); return GTK_WIDGET_CLASS (gtk_flow_box_parent_class)->motion_notify_event (widget, event);
@ -2865,10 +2874,12 @@ gtk_flow_box_key_press_event (GtkWidget *widget,
{ {
GtkFlowBox *box = GTK_FLOW_BOX (widget); GtkFlowBox *box = GTK_FLOW_BOX (widget);
GtkFlowBoxPrivate *priv = BOX_PRIV (box); GtkFlowBoxPrivate *priv = BOX_PRIV (box);
guint keyval;
if (priv->rubberband_select) if (priv->rubberband_select)
{ {
if (event->keyval == GDK_KEY_Escape) if (gdk_event_get_keyval ((GdkEvent *) event, &keyval) &&
keyval == GDK_KEY_Escape)
{ {
gtk_flow_box_stop_rubberband (box); gtk_flow_box_stop_rubberband (box);
return TRUE; return TRUE;