diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index aa0ea804ae6..04f9b895742 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* X Communication module for terminals which understand the X protocol. | 1 | /* X Communication module for terminals which understand the X protocol. |
| 2 | Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 2 | Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 3 | 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 3 | 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -9285,7 +9285,14 @@ x_wm_set_icon_pixmap (f, pixmap_id) | |||
| 9285 | #endif | 9285 | #endif |
| 9286 | } | 9286 | } |
| 9287 | 9287 | ||
| 9288 | #ifdef USE_X_TOOLKIT /* same as in x_wm_set_window_state. */ | 9288 | |
| 9289 | #ifdef USE_GTK | ||
| 9290 | { | ||
| 9291 | xg_set_frame_icon (f, icon_pixmap, icon_mask); | ||
| 9292 | return; | ||
| 9293 | } | ||
| 9294 | |||
| 9295 | #elif defined (USE_X_TOOLKIT) /* same as in x_wm_set_window_state. */ | ||
| 9289 | 9296 | ||
| 9290 | { | 9297 | { |
| 9291 | Arg al[1]; | 9298 | Arg al[1]; |
| @@ -9295,12 +9302,12 @@ x_wm_set_icon_pixmap (f, pixmap_id) | |||
| 9295 | XtSetValues (f->output_data.x->widget, al, 1); | 9302 | XtSetValues (f->output_data.x->widget, al, 1); |
| 9296 | } | 9303 | } |
| 9297 | 9304 | ||
| 9298 | #else /* not USE_X_TOOLKIT */ | 9305 | #else /* not USE_X_TOOLKIT && not USE_GTK */ |
| 9299 | 9306 | ||
| 9300 | f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint); | 9307 | f->output_data.x->wm_hints.flags |= (IconPixmapHint | IconMaskHint); |
| 9301 | XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); | 9308 | XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); |
| 9302 | 9309 | ||
| 9303 | #endif /* not USE_X_TOOLKIT */ | 9310 | #endif /* not USE_X_TOOLKIT && not USE_GTK */ |
| 9304 | } | 9311 | } |
| 9305 | 9312 | ||
| 9306 | void | 9313 | void |