wayland: Remove unused variable

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 3de86a9c1b9de93b1a41d6ea85661f3c7d089f79..196504bf355f952be6a655b15c12ef7fdd679954 100644 (file)
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -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))

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index c4a91355c407e5341046996cf8f946372ef42640..0c35ce2fb47e256f4bdd8d566f7e6508e991feef 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -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)
     {