Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 2272:4ec724310f33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-14 20:54:29 by james] Eliminate gcc shadow warnings.
author james
date Tue, 14 Sep 2004 20:54:37 +0000
parents 95fee4a1420e
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
2271:0dfff19d20da 2272:4ec724310f33
1427 return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK; 1427 return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK;
1428 } 1428 }
1429 1429
1430 extern guint symbol_to_enum (Lisp_Object, GtkType); 1430 extern guint symbol_to_enum (Lisp_Object, GtkType);
1431 1431
1432 static guint resource_name_to_resource (Lisp_Object name, image_instance_type type) 1432 static guint resource_name_to_resource (Lisp_Object name,
1433 enum image_instance_type type)
1433 { 1434 {
1434 if (type == IMAGE_POINTER) 1435 if (type == IMAGE_POINTER)
1435 return (symbol_to_enum (name, GTK_TYPE_GDK_CURSOR_TYPE)); 1436 return (symbol_to_enum (name, GTK_TYPE_GDK_CURSOR_TYPE));
1436 else 1437 else
1437 return (0); 1438 return (0);
1438 } 1439 }
1439 1440
1440 static image_instance_type 1441 static enum image_instance_type
1441 resource_symbol_to_type (Lisp_Object data) 1442 resource_symbol_to_type (Lisp_Object data)
1442 { 1443 {
1443 if (EQ (data, Qcursor)) 1444 if (EQ (data, Qcursor))
1444 return IMAGE_POINTER; 1445 return IMAGE_POINTER;
1445 #if 0 1446 #if 0
1457 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1458 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1458 int dest_mask, Lisp_Object domain) 1459 int dest_mask, Lisp_Object domain)
1459 { 1460 {
1460 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 1461 struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
1461 GdkCursor *c = NULL; 1462 GdkCursor *c = NULL;
1462 image_instance_type type; 1463 enum image_instance_type type;
1463 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 1464 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
1464 Lisp_Object resource_type = find_keyword_in_vector (instantiator, Q_resource_type); 1465 Lisp_Object resource_type = find_keyword_in_vector (instantiator, Q_resource_type);
1465 Lisp_Object resource_id = find_keyword_in_vector (instantiator, Q_resource_id); 1466 Lisp_Object resource_id = find_keyword_in_vector (instantiator, Q_resource_id);
1466 1467
1467 if (!DEVICE_GTK_P (XDEVICE (device))) 1468 if (!DEVICE_GTK_P (XDEVICE (device)))