[gtk/wip/baedert/for-master] frame: Remove unnecessary function



commit 47a6438bcce35f3400a7ec11e2b50fb822cd8378
Author: Timm Bäder <mail baedert org>
Date:   Sun Dec 27 21:14:49 2020 +0100

    frame: Remove unnecessary function
    
    Just call the vfunc directly in the only place we used to call the old
    wrapper

 gtk/gtkframe.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index a8aa980779..10b9c818d4 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -114,9 +114,6 @@ static void gtk_frame_size_allocate (GtkWidget  *widget,
                                      int         width,
                                      int         height,
                                      int         baseline);
-
-static void gtk_frame_compute_child_allocation      (GtkFrame      *frame,
-                                                     GtkAllocation *child_allocation);
 static void gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
                                                      GtkAllocation *child_allocation);
 
@@ -497,7 +494,7 @@ gtk_frame_size_allocate (GtkWidget *widget,
   GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
   GtkAllocation new_allocation;
 
-  gtk_frame_compute_child_allocation (frame, &new_allocation);
+  GTK_FRAME_GET_CLASS (frame)->compute_child_allocation (frame, &new_allocation);
 
   if (priv->label_widget &&
       gtk_widget_get_visible (priv->label_widget))
@@ -529,16 +526,6 @@ gtk_frame_size_allocate (GtkWidget *widget,
     gtk_widget_size_allocate (priv->child, &new_allocation, -1);
 }
 
-static void
-gtk_frame_compute_child_allocation (GtkFrame      *frame,
-                                    GtkAllocation *child_allocation)
-{
-  g_return_if_fail (GTK_IS_FRAME (frame));
-  g_return_if_fail (child_allocation != NULL);
-
-  GTK_FRAME_GET_CLASS (frame)->compute_child_allocation (frame, child_allocation);
-}
-
 static void
 gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
                                          GtkAllocation *child_allocation)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]