diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-09-09 19:05:13 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-09-09 19:05:13 +0200 |
commit | 81a4cf469a0f5c1603ac3130af9f011053854180 (patch) | |
tree | 3c0578bddf565bd5a66e71ac9990a76aa281615e | |
parent | ba7c0d7b4ce03336b4aebe1959c1a8342fa6dbd4 (diff) |
patch 8.2.1645: GTK3: icons become broken images when resizedv8.2.1645
Problem: GTK3: icons become broken images when resized.
Solution: Use gtk_image_new_from_icon_name(). (closes #6916)
Fix compiler warnings.
-rw-r--r-- | src/gui_gtk_x11.c | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 341db3d5a9..fe1ac58782 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -2555,7 +2555,8 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons); - g_list_foreach(icons, (GFunc)&g_object_unref, NULL); + // TODO: is this type cast OK? + g_list_foreach(icons, (GFunc)(void *)&g_object_unref, NULL); g_list_free(icons); } @@ -3092,8 +3093,8 @@ icon_size_changed_foreach(GtkWidget *widget, gpointer user_data) const gchar *icon_name; gtk_image_get_icon_name(image, &icon_name, NULL); - - gtk_image_set_from_icon_name(image, icon_name, icon_size); + image = (GtkImage *)gtk_image_new_from_icon_name( + icon_name, icon_size); } # else // User-defined icons are stored in a GtkIconSet @@ -4967,7 +4968,8 @@ ascii_glyph_table_init(void) } } - g_list_foreach(item_list, (GFunc)&pango_item_free, NULL); + // TODO: is this type cast OK? + g_list_foreach(item_list, (GFunc)(void *)&pango_item_free, NULL); g_list_free(item_list); pango_attr_list_unref(attr_list); } diff --git a/src/version.c b/src/version.c index 1d1e00e61f..d108c1783e 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1645, +/**/ 1644, /**/ 1643, |