mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change how GDK image resources are compiled in.

Browse Source 
The compiled in image resources were being created as a structure in a
generated c source file. The generation of this file caused constness
warning as a guint8 * was initialised from a const char array.

This changes the generation and use of these compiled in resources to
use the raw inline form as suggested by the documentation removing the
const warning.
This commit is contained in:
Vincent Sanders 2015-05-20 16:43:48 +01:00
parent 8f1c9673d7
commit a29e9589f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/Makefile.target
View File

@ -92,7 +92,7 @@ S_PIXBUF += $(2)
$(2): $(1)
$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
$(Q)gdk-pixbuf-csource --extern --raw --name=$(3) $(1) >> $(2) || \
( rm -f $(2) && false )
endef

4
gtk/window.c
View File

@ -56,7 +56,7 @@
#include "gtk/gdk.h"
extern const GdkPixdata menu_cursor_pixdata;
extern const guint8 *menu_cursor_pixdata;
static GtkWidget *select_menu;
static struct form_control *select_menu_control;
@ -1080,7 +1080,7 @@ static GdkCursor *nsgtk_create_menu_cursor(void)
{
GdkCursor *cursor = NULL;
GdkPixbuf *pixbuf;
pixbuf = gdk_pixbuf_from_pixdata(&menu_cursor_pixdata, FALSE, NULL);
pixbuf = gdk_pixbuf_new_from_inline(-1, menu_cursor_pixdata, FALSE, NULL);
cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 0, 3);
g_object_unref (pixbuf);