From 28b18129b5f520b5b98f93c3ee5cf9b793095b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Fri, 5 May 2017 13:27:54 +0200
Subject: [PATCH] button: Remove gadget

---
 gtk/gtkbutton.c        | 13 ++-----------
 gtk/gtkbuttonprivate.h |  2 --
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index b08b0f5a1d..149de66006 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -70,7 +70,6 @@
 #include "a11y/gtkbuttonaccessible.h"
 #include "gtkapplicationprivate.h"
 #include "gtkactionhelper.h"
-#include "gtkcsscustomgadgetprivate.h"
 #include "gtkcontainerprivate.h"
 
 /* Time out before giving up on getting a key release when animating
@@ -443,14 +442,6 @@ gtk_button_init (GtkButton *button)
   g_signal_connect (priv->gesture, "cancel", G_CALLBACK (multipress_gesture_cancel_cb), button);
   gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_CAPTURE);
 
-  priv->gadget = gtk_css_custom_gadget_new_for_node (gtk_widget_get_css_node (GTK_WIDGET (button)),
-                                                     GTK_WIDGET (button),
-                                                     NULL,
-                                                     NULL,
-                                                     NULL,
-                                                     NULL,
-                                                     NULL);
-
 }
 
 static void
@@ -460,7 +451,6 @@ gtk_button_finalize (GObject *object)
   GtkButtonPrivate *priv = button->priv;
 
   g_clear_object (&priv->gesture);
-  g_clear_object (&priv->gadget);
 
   G_OBJECT_CLASS (gtk_button_parent_class)->finalize (object);
 }
@@ -759,7 +749,6 @@ static void
 gtk_button_size_allocate (GtkWidget     *widget,
 			  GtkAllocation *allocation)
 {
-  GtkButton *button = GTK_BUTTON (widget);
   GtkAllocation clip = *allocation;
   GtkWidget *child;
 
@@ -770,6 +759,8 @@ gtk_button_size_allocate (GtkWidget     *widget,
                                               gtk_widget_get_allocated_baseline (widget));
       gtk_widget_get_clip (child, &clip);
     }
+
+  gtk_widget_set_clip (widget, &clip);
 }
 
 static void
diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index 8a85676fe8..909a5f1a45 100644
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -21,7 +21,6 @@
 
 #include "gtkactionhelper.h"
 #include "gtkgesturesingle.h"
-#include "gtkcssgadgetprivate.h"
 
 G_BEGIN_DECLS
 
@@ -29,7 +28,6 @@ G_BEGIN_DECLS
 struct _GtkButtonPrivate
 {
   GtkActionHelper       *action_helper;
-  GtkCssGadget          *gadget;
 
   GdkDevice             *grab_keyboard;