diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-29 09:55:25 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-29 09:55:25 +0400 |
| commit | 0085b9be229be7369300f4f4ab27a9699db641b4 (patch) | |
| tree | c9f11e1b06eaa030b0a0ebacbaf38f5eef6c5d77 /src/xfns.c | |
| parent | b9bef71fd33a3789b2a67a19745f6bbf8f4aff6e (diff) | |
| download | emacs-0085b9be229be7369300f4f4ab27a9699db641b4.tar.gz | |
* xterm.h (struct x_output): For 'black_relief' and 'white_relief'
fields, drop 'allocated_p' member and use -1 for uninitialized value.
* w32term.h (struct w32_output): Similarly but do not use -1 because...
* xfaces.c (unload_color) [HAVE_X_WINDOWS]: ...this function is a no-op
on MS-Windows anyway.
(free_face_colors): Define only if HAVE_X_WINDOWS and...
(free_realized_face): ...adjust user.
* xfns.c (Fx_create_frame, x_create_tip_frame): Initialize black and
white relief pixels to -1.
* xterm.c (x_setup_relief_color, x_free_frame_resources): Adjust users.
* w32term.c (w32_setup_relief_color, x_free_frame_resources): Likewise.
* dispextern.h (unload_color): Move prototype under HAVE_X_WINDOWS.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c index 9cd7d3e6627..695a72a7024 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2880,6 +2880,8 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ + f->output_data.x->white_relief.pixel = -1; + f->output_data.x->black_relief.pixel = -1; fset_icon_name (f, x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", @@ -4824,6 +4826,9 @@ x_create_tip_frame (struct x_display_info *dpyinfo, f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ + f->output_data.x->white_relief.pixel = -1; + f->output_data.x->black_relief.pixel = -1; + fset_icon_name (f, Qnil); FRAME_DISPLAY_INFO (f) = dpyinfo; f->output_data.x->parent_desc = FRAME_DISPLAY_INFO (f)->root_window; |