(x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the

scroll bars of the frame before deleting the frame itself.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4353ed6b64fe18ade2d2bb73e043c43e8826a82b..12ff31e67586681c7652eed5bd1282083d40f826 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * xterm.c (x_free_frame_resources) [USE_X_TOOLKIT]: Remove all the
+       scroll bars of the frame before deleting the frame itself.
+
 2001-12-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * s/sol2-5.h (HAVE_VFORK): Define if undefined.

diff --git a/src/xterm.c b/src/xterm.c
index 3a122756f4915f0f4cd194f50c7c954ea399fb64..d003b436ec55627998e48aa647bce4d603ffd977 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13099,6 +13099,8 @@ x_free_frame_resources (f)
      struct frame *f;
 {
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  Lisp_Object bar;
+  struct scroll_bar *b;
 
   BLOCK_INPUT;
 
@@ -13108,15 +13110,27 @@ x_free_frame_resources (f)
     {
       if (f->output_data.x->icon_desc)
        XDestroyWindow (FRAME_X_DISPLAY (f), f->output_data.x->icon_desc);
-      
+
+#ifdef USE_X_TOOLKIT
+      /* Explicitly destroy the scroll bars of the frame.  Without
+        this, we get "BadDrawable" errors from the toolkit later on,
+        presumably from expose events generated for the disappearing
+        toolkit scroll bars.  */
+      for (bar = FRAME_SCROLL_BARS (f); !NILP (bar); bar = b->next)
+       {
+         b = XSCROLL_BAR (bar);
+         x_scroll_bar_remove (b);
+       }
+#endif
+
 #ifdef HAVE_X_I18N
       if (FRAME_XIC (f))
        free_frame_xic (f);
 #endif
-      
+
       if (FRAME_X_WINDOW (f))
        XDestroyWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
-      
+
 #ifdef USE_X_TOOLKIT
       if (f->output_data.x->widget)
        {
@@ -13132,7 +13146,7 @@ x_free_frame_resources (f)
       unload_color (f, f->output_data.x->cursor_foreground_pixel);
       unload_color (f, f->output_data.x->border_pixel);
       unload_color (f, f->output_data.x->mouse_pixel);
-      
+
       if (f->output_data.x->scroll_bar_background_pixel != -1)
        unload_color (f, f->output_data.x->scroll_bar_background_pixel);
       if (f->output_data.x->scroll_bar_foreground_pixel != -1)