diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-01 10:38:49 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-01 10:38:49 +0400 |
| commit | 52b8a085f779789a9774b2890390df3758c8c302 (patch) | |
| tree | c827b55e831d39826b93e68ea321bd83c0d4377a /src/frame.c | |
| parent | 1ca6cc28eb0aa7a7c20059e3eb1078ac3b646d79 (diff) | |
Do not use pure Xism x_wm_set_icon_position in non-X ports.
* frame.c (x_set_frame_parameters): Call to x_wm_set_icon_position
only if HAVE_X_WINDOWS is in use.
* frame.h (x_set_frame_parameters): Move under HAVE_X_WINDOWS.
* nsterm.m (x_wm_set_icon_position): Remove no-op.
* w32term.c (x_wm_set_icon_position): Likewise.
* w32fns.c (x_icon): Adjust user.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 6e56a20f85..f5d1971a2b 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2867,10 +2867,11 @@ x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist) /* Actually set that position, and convert to absolute. */ x_set_offset (f, leftpos, toppos, -1); } - +#ifdef HAVE_X_WINDOWS if ((!NILP (icon_left) || !NILP (icon_top)) && ! (icon_left_no_change && icon_top_no_change)) x_wm_set_icon_position (f, XINT (icon_left), XINT (icon_top)); +#endif /* HAVE_X_WINDOWS */ } UNGCPRO; |