adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0437: Motif requires non-const char pointer for XPM data

Browse Source 
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>
This commit is contained in:
Drew Vogel
2024-05-23 17:49:39 +02:00
committed by Christian Brabandt
parent 789679cfc4
commit 742062f31f
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/vim16x16.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char * vim16x16[] = { static char * vim16x16[] = {
"16 16 8 1", "16 16 8 1",
" c None", " c None",
". c #000000", ". c #000000",

2
runtime/vim32x32.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char * vim32x32[] = { static char * vim32x32[] = {
"32 32 8 1", "32 32 8 1",
" c None", " c None",
". c #000000", ". c #000000",

2
runtime/vim48x48.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char * vim48x48[] = { static char * vim48x48[] = {
"48 48 8 1", "48 48 8 1",
" c None", " c None",
". c #000000", ". c #000000",

6
src/gui_gtk_x11.c
View File

@ -2727,9 +2727,9 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
*/ */
GList *icons = NULL; 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((const char **)vim16x16));
icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim32x32)); 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(vim48x48)); icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim48x48));
gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons); gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
437,
/**/ /**/
436, 436,
/**/ /**/