/[emacs]/emacs/src/xterm.c
ViewVC logotype

Diff of /emacs/src/xterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.650.4.19 by gerd, Wed Nov 28 17:10:42 2001 UTC revision 1.650.4.20 by eliz, Thu Dec 6 12:00:06 2001 UTC
# Line 13099  x_free_frame_resources (f) Line 13099  x_free_frame_resources (f)
13099       struct frame *f;       struct frame *f;
13100  {  {
13101    struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);    struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
13102      Lisp_Object bar;
13103      struct scroll_bar *b;
13104    
13105    BLOCK_INPUT;    BLOCK_INPUT;
13106    
# Line 13108  x_free_frame_resources (f) Line 13110  x_free_frame_resources (f)
13110      {      {
13111        if (f->output_data.x->icon_desc)        if (f->output_data.x->icon_desc)
13112          XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);          XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
13113          
13114    #ifdef USE_X_TOOLKIT
13115          /* Explicitly destroy the scroll bars of the frame.  Without
13116             this, we get "BadDrawable" errors from the toolkit later on,
13117             presumably from expose events generated for the disappearing
13118             toolkit scroll bars.  */
13119          for (bar = FRAME_SCROLL_BARS (f); !NILP (bar); bar = b->next)
13120            {
13121              b = XSCROLL_BAR (bar);
13122              x_scroll_bar_remove (b);
13123            }
13124    #endif
13125    
13126  #ifdef HAVE_X_I18N  #ifdef HAVE_X_I18N
13127        if (FRAME_XIC (f))        if (FRAME_XIC (f))
13128          free_frame_xic (f);          free_frame_xic (f);
13129  #endif  #endif
13130          
13131        if (FRAME_X_WINDOW (f))        if (FRAME_X_WINDOW (f))
13132          XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));          XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
13133          
13134  #ifdef USE_X_TOOLKIT  #ifdef USE_X_TOOLKIT
13135        if (f->output_data.x->widget)        if (f->output_data.x->widget)
13136          {          {
# Line 13132  x_free_frame_resources (f) Line 13146  x_free_frame_resources (f)
13146        unload_color (f, f->output_data.x->cursor_foreground_pixel);        unload_color (f, f->output_data.x->cursor_foreground_pixel);
13147        unload_color (f, f->output_data.x->border_pixel);        unload_color (f, f->output_data.x->border_pixel);
13148        unload_color (f, f->output_data.x->mouse_pixel);        unload_color (f, f->output_data.x->mouse_pixel);
13149          
13150        if (f->output_data.x->scroll_bar_background_pixel != -1)        if (f->output_data.x->scroll_bar_background_pixel != -1)
13151          unload_color (f, f->output_data.x->scroll_bar_background_pixel);          unload_color (f, f->output_data.x->scroll_bar_background_pixel);
13152        if (f->output_data.x->scroll_bar_foreground_pixel != -1)        if (f->output_data.x->scroll_bar_foreground_pixel != -1)

Legend:
Removed from v.1.650.4.19  
changed lines
  Added in v.1.650.4.20

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26