Rename gtk_icon_view_get_cell_area to gtk_icon_view_get_cell_rect

get_cell_area was "conflicting" with the property named "cell-area"
which is something different.

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index a80d569f6b4415c1c97d3518a3b8ade83f4da7b0..9ec40c9f328d43dd111d2b3cb0ac8a0352722a57 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1741,7 +1741,7 @@ gtk_icon_view_set_margin
 gtk_icon_view_get_margin
 gtk_icon_view_set_item_padding
 gtk_icon_view_get_item_padding
-gtk_icon_view_get_cell_area
+gtk_icon_view_get_cell_rect
 gtk_icon_view_select_path
 gtk_icon_view_unselect_path
 gtk_icon_view_path_is_selected

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 7a86608761f3bcd278b8603be8c9ef7e73b772c1..8b6f90232e768bf70c39b908ad3059cf2aa922fa 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1293,7 +1293,7 @@ gtk_icon_view_create_drag_icon
 gtk_icon_view_drop_position_get_type
 gtk_icon_view_enable_model_drag_dest
 gtk_icon_view_enable_model_drag_source
-gtk_icon_view_get_cell_area
+gtk_icon_view_get_cell_rect
 gtk_icon_view_get_columns
 gtk_icon_view_get_column_spacing
 gtk_icon_view_get_cursor

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 2d33fe443e463776757f4eb37df293d8a8f2730e..9e8e1e2b259365bada2dc5d1032ff50c380ce416 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4451,7 +4451,7 @@ gtk_icon_view_get_item_at_pos (GtkIconView      *icon_view,
 }
 
 /**
- * gtk_icon_view_get_cell_area:
+ * gtk_icon_view_get_cell_rect:
  * @icon_view: a #GtkIconView
  * @path: a #GtkTreePath
  * @cell: (allow-none): a #GtkCellRenderer or %NULL
@@ -4467,7 +4467,7 @@ gtk_icon_view_get_item_at_pos (GtkIconView      *icon_view,
  * Since: 3.6
  */
 gboolean
-gtk_icon_view_get_cell_area (GtkIconView     *icon_view,
+gtk_icon_view_get_cell_rect (GtkIconView     *icon_view,
                              GtkTreePath     *path,
                              GtkCellRenderer *cell,
                              GdkRectangle    *rect)
@@ -4562,7 +4562,7 @@ gtk_icon_view_set_tooltip_cell (GtkIconView     *icon_view,
   g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
   g_return_if_fail (cell == NULL || GTK_IS_CELL_RENDERER (cell));
 
-  if (!gtk_icon_view_get_cell_area (icon_view, path, cell, &rect))
+  if (!gtk_icon_view_get_cell_rect (icon_view, path, cell, &rect))
     return;
 
   gtk_tooltip_set_tip_area (tooltip, &rect);

diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 469e9ffa8167b8f92f1b8ccde0cd68a08b5d3908..554902eae0f0baf5729c0a939fb1bd5dc281062f 100644 (file)
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -236,7 +236,7 @@ void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon
                                                                gint        *bx,
                                                                gint        *by);
 GDK_AVAILABLE_IN_3_6
-gboolean gtk_icon_view_get_cell_area                          (GtkIconView     *icon_view,
+gboolean gtk_icon_view_get_cell_rect                          (GtkIconView     *icon_view,
                                                               GtkTreePath     *path,
                                                               GtkCellRenderer *cell,
                                                               GdkRectangle    *rect);