From 2da886dd0e170d0cf82b91f6cacf56cf8e46d5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sat, 22 Oct 2016 09:13:52 +0200 Subject: [PATCH] Remove gtk_cell_view_get_size_of_row --- docs/reference/gtk/gtk4-sections.txt | 1 - gtk/gtkcellview.c | 45 ---------------------------- gtk/gtkcellview.h | 4 --- 3 files changed, 50 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index e0988131ba..4103df77c5 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -4268,7 +4268,6 @@ gtk_cell_view_set_model gtk_cell_view_get_model gtk_cell_view_set_displayed_row gtk_cell_view_get_displayed_row -gtk_cell_view_get_size_of_row gtk_cell_view_set_background_color gtk_cell_view_set_background_rgba gtk_cell_view_set_draw_sensitive diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index e02b112173..80c7f564ad 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -1298,51 +1298,6 @@ gtk_cell_view_get_displayed_row (GtkCellView *cell_view) return gtk_tree_row_reference_get_path (cell_view->priv->displayed_row); } -/** - * gtk_cell_view_get_size_of_row: - * @cell_view: a #GtkCellView - * @path: a #GtkTreePath - * @requisition: (out): return location for the size - * - * Sets @requisition to the size needed by @cell_view to display - * the model row pointed to by @path. - * - * Returns: %TRUE - * - * Since: 2.6 - * - * Deprecated: 3.0: Combo box formerly used this to calculate the - * sizes for cellviews, now you can achieve this by either using - * the #GtkCellView:fit-model property or by setting the currently - * displayed row of the #GtkCellView and using gtk_widget_get_preferred_size(). - */ -gboolean -gtk_cell_view_get_size_of_row (GtkCellView *cell_view, - GtkTreePath *path, - GtkRequisition *requisition) -{ - GtkTreeRowReference *tmp; - GtkRequisition req; - - g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE); - g_return_val_if_fail (path != NULL, FALSE); - - tmp = cell_view->priv->displayed_row; - cell_view->priv->displayed_row = - gtk_tree_row_reference_new (cell_view->priv->model, path); - - gtk_widget_get_preferred_width (GTK_WIDGET (cell_view), &req.width, NULL); - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (cell_view), req.width, &req.height, NULL); - - gtk_tree_row_reference_free (cell_view->priv->displayed_row); - cell_view->priv->displayed_row = tmp; - - if (requisition) - *requisition = req; - - return TRUE; -} - /** * gtk_cell_view_set_background_rgba: * @cell_view: a #GtkCellView diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index 7a3ff56a44..560fa691b0 100644 --- a/gtk/gtkcellview.h +++ b/gtk/gtkcellview.h @@ -103,10 +103,6 @@ GDK_AVAILABLE_IN_ALL void gtk_cell_view_set_fit_model (GtkCellView *cell_view, gboolean fit_model); -GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size) -gboolean gtk_cell_view_get_size_of_row (GtkCellView *cell_view, - GtkTreePath *path, - GtkRequisition *requisition); G_END_DECLS #endif /* __GTK_CELL_VIEW_H__ */