comparison src/xfns.c @ 59904:adc18da68682

(unwind_create_frame) [!GLYPH_DEBUG]: Fix xassert.
author Kim F. Storm <storm@cua.dk>
date Thu, 03 Feb 2005 14:09:04 +0000
parents 97d17acaf4e7
children d6551c039c8f
comparison
equal deleted inserted replaced
59903:f2619addaa72 59904:adc18da68682
2861 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 2861 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
2862 #endif 2862 #endif
2863 2863
2864 x_free_frame_resources (f); 2864 x_free_frame_resources (f);
2865 2865
2866 #if GLYPH_DEBUG
2866 /* Check that reference counts are indeed correct. */ 2867 /* Check that reference counts are indeed correct. */
2867 xassert (dpyinfo->reference_count == dpyinfo_refcount); 2868 xassert (dpyinfo->reference_count == dpyinfo_refcount);
2868 xassert (dpyinfo->image_cache->refcount == image_cache_refcount); 2869 xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
2870 #endif
2869 return Qt; 2871 return Qt;
2870 } 2872 }
2871 2873
2872 return Qnil; 2874 return Qnil;
2873 } 2875 }
4085 target_type = XInternAtom (FRAME_X_DISPLAY (f), SDATA (type), False); 4087 target_type = XInternAtom (FRAME_X_DISPLAY (f), SDATA (type), False);
4086 } 4088 }
4087 4089
4088 if (! NILP (outer_p)) w = FRAME_OUTER_WINDOW (f); 4090 if (! NILP (outer_p)) w = FRAME_OUTER_WINDOW (f);
4089 else w = FRAME_X_WINDOW (f); 4091 else w = FRAME_X_WINDOW (f);
4090 4092
4091 XChangeProperty (FRAME_X_DISPLAY (f), w, 4093 XChangeProperty (FRAME_X_DISPLAY (f), w,
4092 prop_atom, target_type, element_format, PropModeReplace, 4094 prop_atom, target_type, element_format, PropModeReplace,
4093 data, nelements); 4095 data, nelements);
4094 4096
4095 if (CONSP (value)) xfree (data); 4097 if (CONSP (value)) xfree (data);
5254 5256
5255 /* Pop down on C-g. */ 5257 /* Pop down on C-g. */
5256 if (keysym == XK_g && (event.xkey.state & ControlMask) != 0) 5258 if (keysym == XK_g && (event.xkey.state & ControlMask) != 0)
5257 XtUnmanageChild (dialog); 5259 XtUnmanageChild (dialog);
5258 } 5260 }
5259 5261
5260 (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f)); 5262 (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f));
5261 } 5263 }
5262 5264
5263 /* Get the result. */ 5265 /* Get the result. */
5264 if (result == XmCR_OK) 5266 if (result == XmCR_OK)