Mercurial > hg > xemacs-beta
comparison src/frame-x.c @ 384:bbff43aa5eb7 r21-2-7
Import from CVS: tag r21-2-7
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:08:24 +0200 |
parents | 8626e4521993 |
children | 6719134a07c2 |
comparison
equal
deleted
inserted
replaced
383:6a50c6a581a5 | 384:bbff43aa5eb7 |
---|---|
2630 | 2630 |
2631 #ifdef HAVE_CDE | 2631 #ifdef HAVE_CDE |
2632 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); | 2632 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); |
2633 #endif /* HAVE_CDE */ | 2633 #endif /* HAVE_CDE */ |
2634 | 2634 |
2635 assert (FRAME_X_SHELL_WIDGET (f)); | 2635 assert (FRAME_X_SHELL_WIDGET (f) != 0); |
2636 if (FRAME_X_SHELL_WIDGET (f)) | 2636 |
2637 { | 2637 #ifdef EXTERNAL_WIDGET |
2638 Display *dpy = XtDisplay (FRAME_X_SHELL_WIDGET (f)); | 2638 expect_x_error (XtDisplay (FRAME_X_SHELL_WIDGET (f))); |
2639 expect_x_error (dpy); | 2639 /* for obscure reasons having (I think) to do with the internal |
2640 /* for obscure reasons having (I think) to do with the internal | 2640 window-to-widget hierarchy maintained by Xt, we have to call |
2641 window-to-widget hierarchy maintained by Xt, we have to call | 2641 XtUnrealizeWidget() here. Xt can really suck. */ |
2642 XtUnrealizeWidget() here. Xt can really suck. */ | 2642 if (f->being_deleted) |
2643 if (f->being_deleted) | 2643 XtUnrealizeWidget (FRAME_X_SHELL_WIDGET (f)); |
2644 XtUnrealizeWidget (FRAME_X_SHELL_WIDGET (f)); | 2644 XtDestroyWidget (FRAME_X_SHELL_WIDGET (f)); |
2645 XtDestroyWidget (FRAME_X_SHELL_WIDGET (f)); | 2645 x_error_occurred_p (XtDisplay (FRAME_X_SHELL_WIDGET (f))); |
2646 x_error_occurred_p (dpy); | 2646 #else |
2647 | 2647 XtDestroyWidget (FRAME_X_SHELL_WIDGET (f)); |
2648 /* make sure the windows are really gone! */ | 2648 /* make sure the windows are really gone! */ |
2649 /* ### Is this REALLY necessary? */ | 2649 /* ### Is this REALLY necessary? */ |
2650 XFlush (dpy); | 2650 XFlush (XtDisplay (FRAME_X_SHELL_WIDGET (f))); |
2651 | 2651 #endif /* EXTERNAL_WIDGET */ |
2652 FRAME_X_SHELL_WIDGET (f) = 0; | 2652 |
2653 } | 2653 FRAME_X_SHELL_WIDGET (f) = 0; |
2654 | 2654 |
2655 if (FRAME_X_GEOM_FREE_ME_PLEASE (f)) | 2655 if (FRAME_X_GEOM_FREE_ME_PLEASE (f)) |
2656 { | 2656 { |
2657 xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f)); | 2657 xfree (FRAME_X_GEOM_FREE_ME_PLEASE (f)); |
2658 FRAME_X_GEOM_FREE_ME_PLEASE (f) = 0; | 2658 FRAME_X_GEOM_FREE_ME_PLEASE (f) = 0; |