aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-01-29 22:25:58 +0000
committerJan Djärv2005-01-29 22:25:58 +0000
commit49b8b5dcb303bb12ab4f503c42ed1d7c1e6a2132 (patch)
tree9ff4a8f8e7edd3aa13c8d9e1bd55bdfd631090bd /src
parent5a92a9eb7821b7efe89ef2c4d53f72099e64531e (diff)
downloademacs-49b8b5dcb303bb12ab4f503c42ed1d7c1e6a2132.tar.gz
emacs-49b8b5dcb303bb12ab4f503c42ed1d7c1e6a2132.zip
* xfns.c (show_hourglass): Use FRAME_X_WINDOW as parent for GTK,
button events are not received otherwise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6c2b21823ad..3180fa1216c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-01-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xfns.c (show_hourglass): Use FRAME_X_WINDOW as parent for GTK,
4 button events are not received otherwise.
5
12005-01-29 Richard M. Stallman <rms@gnu.org> 62005-01-29 Richard M. Stallman <rms@gnu.org>
2 7
3 * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix. 8 * buffer.c (syms_of_buffer) <buffer-undo-list>: Doc fix.
diff --git a/src/xfns.c b/src/xfns.c
index 9ee459680aa..64a83cdd5f6 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4339,11 +4339,15 @@ show_hourglass (timer)
4339 { 4339 {
4340 unsigned long mask = CWCursor; 4340 unsigned long mask = CWCursor;
4341 XSetWindowAttributes attrs; 4341 XSetWindowAttributes attrs;
4342 4342#ifdef USE_GTK
4343 Window parent = FRAME_X_WINDOW (f);
4344#else
4345 Window parent = FRAME_OUTER_WINDOW (f);
4346#endif
4343 attrs.cursor = f->output_data.x->hourglass_cursor; 4347 attrs.cursor = f->output_data.x->hourglass_cursor;
4344 4348
4345 f->output_data.x->hourglass_window 4349 f->output_data.x->hourglass_window
4346 = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f), 4350 = XCreateWindow (dpy, parent,
4347 0, 0, 32000, 32000, 0, 0, 4351 0, 0, 32000, 32000, 0, 0,
4348 InputOnly, 4352 InputOnly,
4349 CopyFromParent, 4353 CopyFromParent,