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

gtkwindow: Update to using GdkEvent API

Browse Source
This commit is contained in:
Carlos Garnacho 2017-08-25 16:56:53 +02:00
parent 14a28224e4
commit 177f3ef655
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkwindow.c
View File

@ -1816,7 +1816,7 @@ captured_event_cb (GtkWidget *widget,
"sw-resize", "s-resize", "se-resize"
};
if (event->type != GDK_MOTION_NOTIFY)
if (gdk_event_get_event_type (event) != GDK_MOTION_NOTIFY)
return GDK_EVENT_PROPAGATE;
if (!gdk_event_get_coords (event, &x, &y))
return GDK_EVENT_PROPAGATE;
@ -7454,12 +7454,13 @@ gtk_window_handle_wm_event (GtkWindow *window,
GdkEvent *event,
gboolean run_drag)
{
GdkEventType event_type = gdk_event_get_event_type (event);
gboolean retval = GDK_EVENT_PROPAGATE;
GtkWindowPrivate *priv;
if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE ||
event->type == GDK_TOUCH_BEGIN || event->type == GDK_TOUCH_UPDATE ||
event->type == GDK_MOTION_NOTIFY || event->type == GDK_TOUCH_END)
if (event_type == GDK_BUTTON_PRESS || event_type == GDK_BUTTON_RELEASE ||
event_type == GDK_TOUCH_BEGIN || event_type == GDK_TOUCH_UPDATE ||
event_type == GDK_MOTION_NOTIFY || event_type == GDK_TOUCH_END)
{
priv = window->priv;
@ -7480,6 +7481,7 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
{
GtkWindowPrivate *priv;
GtkWidget *widget;
GdkEventType event_type;
widget = gtk_get_event_widget (event);
@ -7494,9 +7496,11 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
if (!priv->multipress_gesture)
return GDK_EVENT_PROPAGATE;
if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE &&
event->type != GDK_MOTION_NOTIFY && event->type != GDK_TOUCH_BEGIN &&
event->type != GDK_TOUCH_END && event->type != GDK_TOUCH_UPDATE)
event_type = gdk_event_get_event_type (event);
if (event_type != GDK_BUTTON_PRESS && event_type != GDK_BUTTON_RELEASE &&
event_type != GDK_MOTION_NOTIFY && event_type != GDK_TOUCH_BEGIN &&
event_type != GDK_TOUCH_END && event_type != GDK_TOUCH_UPDATE)
return GDK_EVENT_PROPAGATE;
if (gtk_widget_event (widget, event))