Mercurial > vim
changeset 35255:70d5193d7a58 v9.1.0437
patch 9.1.0437: Motif requires non-const char pointer for XPM data
Commit: https://github.com/vim/vim/commit/742062f31faca14ae479f4688a5ad8add5d5c120
Author: Drew Vogel <dvogel@github>
Date: Thu May 23 17:49:39 2024 +0200
patch 9.1.0437: Motif requires non-const char pointer for XPM data
Problem: Motif requires non-const char pointer for XPM data shared with
GTK (Tony Mechelynck, after v9.1.0432)
Solution: Cast non-const to const char pointer for GTK (Drew Vogel).
closes: #14834
Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 23 May 2024 18:00:03 +0200 |
| parents | 788039f8f692 |
| children | 757768e16e05 |
| files | runtime/vim16x16.xpm runtime/vim32x32.xpm runtime/vim48x48.xpm src/gui_gtk_x11.c src/version.c |
| diffstat | 5 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/vim16x16.xpm +++ b/runtime/vim16x16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim16x16[] = { +static char * vim16x16[] = { "16 16 8 1", " c None", ". c #000000",
--- a/runtime/vim32x32.xpm +++ b/runtime/vim32x32.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim32x32[] = { +static char * vim32x32[] = { "32 32 8 1", " c None", ". c #000000",
--- a/runtime/vim48x48.xpm +++ b/runtime/vim48x48.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * vim48x48[] = { +static char * vim48x48[] = { "48 48 8 1", " c None", ". c #000000",
--- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -2727,9 +2727,9 @@ mainwin_realize(GtkWidget *widget UNUSED */ GList *icons = NULL; - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim16x16)); - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim32x32)); - icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim48x48)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim16x16)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim32x32)); + icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim48x48)); gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);