From: Timm Bäder <mail@baedert.org>
Date: Sun, 10 Jun 2018 11:39:30 +0000 (+0200)
Subject: button: Remove measure implementation
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~167
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3ffaa023657078cb2024fd9d658c39fc998997b;p=gtk4.git

button: Remove measure implementation

This is already done by GtkBin.
---

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 4879aeb9f5..83894e2509 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -152,13 +152,6 @@ static void gtk_button_do_release      (GtkButton             *button,
 
 static void gtk_button_actionable_iface_init     (GtkActionableInterface *iface);
 
-static void gtk_button_measure_ (GtkWidget      *widget,
-                                 GtkOrientation  orientation,
-                                 int             for_size,
-                                 int            *minimum,
-                                 int            *natural,
-                                 int            *minimum_baseline,
-                                 int            *natural_baseline);
 static void gtk_button_set_child_type (GtkButton *button, guint child_type);
 
 static GParamSpec *props[LAST_PROP] = { NULL, };
@@ -217,7 +210,6 @@ gtk_button_class_init (GtkButtonClass *klass)
   gobject_class->set_property = gtk_button_set_property;
   gobject_class->get_property = gtk_button_get_property;
 
-  widget_class->measure = gtk_button_measure_;
   widget_class->display_changed = gtk_button_display_changed;
   widget_class->unrealize = gtk_button_unrealize;
   widget_class->event = gtk_button_event;
@@ -854,27 +846,6 @@ gtk_button_finish_activate (GtkButton *button,
     gtk_button_clicked (button);
 }
 
-static void
-gtk_button_measure_ (GtkWidget      *widget,
-                     GtkOrientation  orientation,
-                     int             for_size,
-                     int            *minimum,
-                     int            *natural,
-                     int            *minimum_baseline,
-                     int            *natural_baseline)
-{
-  GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
-
-  if (child && gtk_widget_get_visible (child))
-    {
-       gtk_widget_measure (child,
-                           orientation,
-                           for_size,
-                           minimum, natural,
-                           minimum_baseline, natural_baseline);
-    }
-}
-
 /**
  * gtk_button_set_label:
  * @button: a #GtkButton