AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 00:11:29 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Remove unused variable

Browse Source
This commit is contained in:
Benjamin Otte 2017-11-01 20:09:06 +01:00
parent d88c441764
commit 9b0d9aa7a6
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/wayland/gdkwindow-wayland.c
View File

@ -3318,7 +3318,6 @@ gdk_wayland_window_fullscreen_on_monitor (GdkWindow *window,
GdkMonitor *monitor)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkDisplay *display = gdk_window_get_display (window);
struct wl_output *output = ((GdkWaylandMonitor *)monitor)->output;
if (GDK_WINDOW_DESTROYED (window))

8
gtk/gtkbutton.c
View File

@ -313,7 +313,6 @@ multipress_pressed_cb (GtkGestureMultiPress *gesture,
static gboolean
touch_release_in_button (GtkButton *button)
{
GtkAllocation allocation;
GdkEvent *event;
gdouble x, y;
@ -329,11 +328,10 @@ touch_release_in_button (GtkButton *button)
}
gdk_event_get_coords (event, &x, &y);
gtk_widget_get_own_allocation (GTK_WIDGET (button), &allocation);
gdk_event_free (event);
if (gdk_rectangle_contains_point (&allocation, x, y))
if (gtk_widget_contains (GTK_WIDGET (button), x, y));
return TRUE;
return FALSE;
@ -370,17 +368,15 @@ multipress_gesture_update_cb (GtkGesture *gesture,
GtkButton *button)
{
GtkButtonPrivate *priv = button->priv;
GtkAllocation allocation;
gboolean in_button;
gdouble x, y;
if (sequence != gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)))
return;
gtk_widget_get_own_allocation (GTK_WIDGET (button), &allocation);
gtk_gesture_get_point (gesture, sequence, &x, &y);
in_button = gdk_rectangle_contains_point (&allocation, x, y);
in_button = gtk_widget_contains (GTK_WIDGET (button), x, y);
if (priv->in_button != in_button)
{