Gtk+3: Replace deprecated gtk_cell_renderer_get_size with gtk_cell_renderer_get_prefe...

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index c7cced23af8740fd7840cc91a93344bf7a8eb4a6..183c2687648fe9663355bf12fb540224ef2ffb59 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -291,8 +291,9 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
 {
   gint width;
   g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
-  gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
-                              NULL, NULL, NULL, &width, NULL);
+  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview),
+                                        NULL, &width);
+
   return width;
 }
 

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index a06db0b7cd0556ed0d1a3c58a9ab5ae4081aea33..53e5f459e88eea7caeff472e53986fabcfdca581 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -588,8 +588,9 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
   g_object_set (G_OBJECT (renderer),
                 PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text",
                 string, (void *) NULL);
-  gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
-                              NULL, NULL, NULL, &width, NULL);
+
+  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), NULL, &width);
+
   return width;
 }
 

diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index cfdbd628117933d91a52cb64a5d23052a2f991d9..9a8dc7e2d301a01971f969ab7a75de57aad8aadb 100644 (file)
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -575,8 +575,8 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
 {
   gint width;
   g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
-  gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
-                              NULL, NULL, NULL, &width, NULL);
+  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview),
+                             NULL, &width);
   return width;
 }