comparison src/device.c @ 462:0784d089fdc9 r21-2-46

Import from CVS: tag r21-2-46
author cvs
date Mon, 13 Aug 2007 11:44:37 +0200
parents 576fb035e263
children 9a775fb11bb7
comparison
equal deleted inserted replaced
461:120ed4009e51 462:0784d089fdc9
547 The real problem is that the concept of resources is not 547 The real problem is that the concept of resources is not
548 generalized away from X. Similar resource-related 548 generalized away from X. Similar resource-related
549 device-independence violations occur in faces.el. */ 549 device-independence violations occur in faces.el. */
550 int first_x_device = NILP (Vdefault_x_device) && EQ (type, Qx); 550 int first_x_device = NILP (Vdefault_x_device) && EQ (type, Qx);
551 #endif 551 #endif
552 #ifdef HAVE_GTK
553 int first_gtk_device = NILP (Vdefault_gtk_device) && EQ (type, Qgtk);
554 #endif
552 555
553 GCPRO3 (device, console, name); 556 GCPRO3 (device, console, name);
554 557
555 conmeths = decode_console_type (type, ERROR_ME_NOT); 558 conmeths = decode_console_type (type, ERROR_ME_NOT);
556 if (!conmeths) 559 if (!conmeths)
594 Vdefault_device = device; 597 Vdefault_device = device;
595 598
596 init_device_sound (d); 599 init_device_sound (d);
597 #ifdef HAVE_X_WINDOWS 600 #ifdef HAVE_X_WINDOWS
598 if (first_x_device) 601 if (first_x_device)
602 init_global_resources (d);
603 #endif
604 #ifdef HAVE_GTK
605 if (first_gtk_device)
599 init_global_resources (d); 606 init_global_resources (d);
600 #endif 607 #endif
601 init_device_resources (d); 608 init_device_resources (d);
602 609
603 MAYBE_DEVMETH (d, finish_init_device, (d, props)); 610 MAYBE_DEVMETH (d, finish_init_device, (d, props));
756 } 763 }
757 } 764 }
758 765
759 /* #### This should probably be a device method but it is time for 766 /* #### This should probably be a device method but it is time for
760 19.14 to go out the door. */ 767 19.14 to go out the door. */
761 #ifdef HAVE_X_WINDOWS 768 /* #### BILL!!! Should this deal with HAVE_MSWINDOWS as well? */
769 #if defined (HAVE_X_WINDOWS) || defined (HAVE_GTK)
762 /* Next delete all frames which have the popup property to avoid 770 /* Next delete all frames which have the popup property to avoid
763 deleting a child after its parent. */ 771 deleting a child after its parent. */
764 DEVICE_FRAME_LOOP (frmcons, d) 772 DEVICE_FRAME_LOOP (frmcons, d)
765 { 773 {
766 struct frame *f = XFRAME (XCAR (frmcons)); 774 struct frame *f = XFRAME (XCAR (frmcons));