nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-03 21:52:24 +00:00
Code Issues Projects Releases Wiki Activity

Avoid deprecated gtk_cell_renderer_get_size in GTK3.

Browse Source 
gtk_cell_renderer_get_preferred_size() is the new way to do it.
This commit is contained in:
Simon Tatham 2015-08-22 13:53:29 +01:00
parent 6d65a92dfc
commit 3a27e98fb7
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/gtkdlg.c
View File

@ -2810,7 +2810,21 @@ int get_listitemheight(GtkWidget *w)
#else #else
int height; int height;
GtkCellRenderer *cr = gtk_cell_renderer_text_new(); GtkCellRenderer *cr = gtk_cell_renderer_text_new();
#if GTK_CHECK_VERSION(3,0,0)
{
GtkRequisition req;
/*
* Since none of my list items wraps in this GUI, no
* interesting width-for-height behaviour should be happening,
* so I don't think it should matter here whether I ask for
* the minimum or natural height.
*/
gtk_cell_renderer_get_preferred_size(cr, w, &req, NULL);
height = req.height;
}
#else
gtk_cell_renderer_get_size(cr, w, NULL, NULL, NULL, NULL, &height); gtk_cell_renderer_get_size(cr, w, NULL, NULL, NULL, NULL, &height);
#endif
g_object_ref(G_OBJECT(cr)); g_object_ref(G_OBJECT(cr));
g_object_ref_sink(G_OBJECT(cr)); g_object_ref_sink(G_OBJECT(cr));
g_object_unref(G_OBJECT(cr)); g_object_unref(G_OBJECT(cr));