diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-13 00:14:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-13 00:14:30 -0800 |
| commit | 7c86ee9804efc475aa261c8eab8ca9b629657e29 (patch) | |
| tree | 870024e30691163146a29b5c9dabbe5f0611be1d /src/gtkutil.c | |
| parent | 41729b81ac6a60b482aafe7ddc48a43225874818 (diff) | |
| download | emacs-7c86ee9804efc475aa261c8eab8ca9b629657e29.tar.gz emacs-7c86ee9804efc475aa261c8eab8ca9b629657e29.tar.bz2 emacs-7c86ee9804efc475aa261c8eab8ca9b629657e29.zip | |
* gtkutil.c (xg_get_pixbuf_from_pixmap): Add cast from char *
to unsigned char * to avoid compiler diagnostic.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index b1ea6336eb6..8ab41fdefd1 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -76,7 +76,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifndef HAVE_GTK3 #define gdk_window_get_screen(w) gdk_drawable_get_screen (w) #define gdk_window_get_geometry(w, a, b, c, d) \ - gdk_window_get_geometry (w, a, b, c, d, 0) + gdk_window_get_geometry (w, a, b, c, d, 0) #define gdk_x11_window_lookup_for_display(d, w) \ gdk_xid_table_lookup_for_display (d, w) #define GDK_KEY_g GDK_g @@ -258,7 +258,7 @@ xg_get_pixbuf_from_pixmap (FRAME_PTR f, Pixmap pix) ~0, XYPixmap); if (!xim) return 0; - tmp_buf = gdk_pixbuf_new_from_data (xim->data, + tmp_buf = gdk_pixbuf_new_from_data ((guchar *) xim->data, GDK_COLORSPACE_RGB, FALSE, xim->bitmap_unit, @@ -287,7 +287,7 @@ xg_get_pixbuf_from_pix_and_mask (FRAME_PTR f, width = gdk_pixbuf_get_width (icon_buf); height = gdk_pixbuf_get_height (icon_buf); - + if (mask) { GdkPixbuf *mask_buf = xg_get_pixbuf_from_pixmap (f, mask); @@ -393,7 +393,7 @@ xg_get_image_for_pixmap (FRAME_PTR f, Gtk+ assumes the pixmap is always there. */ icon_buf = xg_get_pixbuf_from_pix_and_mask (f, img->pixmap, img->mask); - if (icon_buf) + if (icon_buf) { if (! old_widget) old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf)); |