From fd201e4df786d932d4f7dd8eaaa390d2f4fe33b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Fri, 9 Aug 2019 17:04:58 +0200
Subject: [PATCH] treeviewcolumn: Remove cell_area parameter from
 _cell_get_size

Fixes #297
---
 gtk/gtkentrycompletion.c | 4 ++--
 gtk/gtktreeview.c        | 4 ++--
 gtk/gtktreeviewcolumn.c  | 9 ++++-----
 gtk/gtktreeviewcolumn.h  | 9 ++++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index de68a66e43..79cc3ab578 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1365,9 +1365,9 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
    */
   gtk_widget_get_preferred_size (completion->priv->tree_view,
                                  &tree_req, NULL);
-  gtk_tree_view_column_cell_get_size (completion->priv->column, NULL,
+  gtk_tree_view_column_cell_get_size (completion->priv->column,
                                       NULL, NULL, NULL, &height);
-  gtk_tree_view_column_cell_get_size (action_column, NULL,
+  gtk_tree_view_column_cell_get_size (action_column,
                                       NULL, NULL, NULL, &action_height);
 
   gtk_widget_realize (completion->priv->tree_view);
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5db4a159e2..c5218b14e0 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5669,8 +5669,8 @@ validate_row (GtkTreeView   *tree_view,
 					       GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_IS_PARENT),
 					       node->children?TRUE:FALSE);
       gtk_tree_view_column_cell_get_size (column,
-					  NULL, NULL, NULL,
-					  NULL, &row_height);
+                                          NULL, NULL,
+                                          NULL, &row_height);
 
       if (is_separator)
         {
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 13997d2383..88dfae901d 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2758,11 +2758,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
-				    const GdkRectangle *cell_area,
-				    gint               *x_offset,
-				    gint               *y_offset,
-				    gint               *width,
-				    gint               *height)
+                                    int                *x_offset,
+                                    int                *y_offset,
+                                    int                *width,
+                                    int                *height)
 {
   GtkTreeViewColumnPrivate *priv;
   gint min_width = 0, min_height = 0;
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 801c748627..c9dc183592 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -223,11 +223,10 @@ void                    gtk_tree_view_column_cell_set_cell_data  (GtkTreeViewCol
 								  gboolean                 is_expanded);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewColumn       *tree_column,
-								  const GdkRectangle      *cell_area,
-								  gint                    *x_offset,
-								  gint                    *y_offset,
-								  gint                    *width,
-								  gint                    *height);
+                                                                  int                     *x_offset,
+                                                                  int                     *y_offset,
+                                                                  int                     *width,
+                                                                  int                     *height);
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL