Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 3087:dbd2a866e38a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-11-22 11:24:40 by malcolmp] Fix compilation errors and warnings in GTK code that have appeared over the last few months.
author malcolmp
date Tue, 22 Nov 2005 11:24:45 +0000
parents 4eb2a8c07cb3
children 8475ff9c49ea
comparison
equal deleted inserted replaced
3086:c6ef6267f65c 3087:dbd2a866e38a
684 Lisp_Object instantiator, 684 Lisp_Object instantiator,
685 Lisp_Object pointer_fg, 685 Lisp_Object pointer_fg,
686 Lisp_Object pointer_bg) 686 Lisp_Object pointer_bg)
687 { 687 {
688 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 688 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
689 GdkPixmap *pixmap = IMAGE_INSTANCE_X_PIXMAP (ii); 689 GdkPixmap *pixmap = IMAGE_INSTANCE_GTK_PIXMAP (ii);
690 GdkPixmap *mask = (GdkPixmap *) IMAGE_INSTANCE_PIXMAP_MASK (ii); 690 GdkPixmap *mask = (GdkPixmap *) IMAGE_INSTANCE_GTK_MASK (ii);
691 GdkColor fg, bg; 691 GdkColor fg, bg;
692 int xhot = 0, yhot = 0; 692 int xhot = 0, yhot = 0;
693 int w, h; 693 int w, h;
694 694
695 if (INTP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii))) 695 if (INTP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)))
1308 signal_image_error ("Error reading pixmap", data); 1308 signal_image_error ("Error reading pixmap", data);
1309 1309
1310 gdk_window_get_geometry (pixmap, NULL, NULL, &w, &h, &depth); 1310 gdk_window_get_geometry (pixmap, NULL, NULL, &w, &h, &depth);
1311 1311
1312 IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; 1312 IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
1313 IMAGE_INSTANCE_PIXMAP_MASK (ii) = (void*)mask; 1313 IMAGE_INSTANCE_PIXMAP_MASK (ii) = mask;
1314 IMAGE_INSTANCE_GTK_COLORMAP (ii) = cmap; 1314 IMAGE_INSTANCE_GTK_COLORMAP (ii) = cmap;
1315 IMAGE_INSTANCE_GTK_PIXELS (ii) = 0; 1315 IMAGE_INSTANCE_GTK_PIXELS (ii) = 0;
1316 IMAGE_INSTANCE_GTK_NPIXELS (ii) = 0; 1316 IMAGE_INSTANCE_GTK_NPIXELS (ii) = 0;
1317 IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = w; 1317 IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = w;
1318 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = h; 1318 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = h;
1327 case IMAGE_COLOR_PIXMAP: 1327 case IMAGE_COLOR_PIXMAP:
1328 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth; 1328 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;
1329 break; 1329 break;
1330 1330
1331 case IMAGE_POINTER: 1331 case IMAGE_POINTER:
1332 if (xpmattrs.valuemask & XpmHotspot) 1332 /* #### Gtk does not give us access to the hotspots of a pixmap */
1333 IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_int (xpmattrs.x_hotspot); 1333
1334 if (xpmattrs.valuemask & XpmHotspot) 1334 IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = 1;
1335 IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_int (xpmattrs.y_hotspot); 1335 IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = 1;
1336 1336
1337
1337 image_instance_convert_to_pointer (ii, instantiator, pointer_fg, 1338 image_instance_convert_to_pointer (ii, instantiator, pointer_fg,
1338 pointer_bg); 1339 pointer_bg);
1339 break; 1340 break;
1340 1341
1341 default: 1342 default: