diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-03-19 17:02:46 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-03-19 17:02:46 +0000 |
| commit | fbf076d18a3a828d9ad5d47f6adca2f625a7d1cb (patch) | |
| tree | ad1ecaad569cf1c0117001d5c7dd4d7c45b54c8c /src | |
| parent | 08ce7e0f51ac6f2fc93ac943f35b07b73cbfc3fe (diff) | |
| download | emacs-fbf076d18a3a828d9ad5d47f6adca2f625a7d1cb.tar.gz | |
* w32fns.c (hourglass_timer, hourglass_hwnd): New variables.
(syms_of_w32fns): Initialize them.
(HOURGLASS_ID): New constant.
(x_window_to_frame): Don't check hourglass_window.
(w32_wnd_proc) <WM_TIMER>: Handle hourglass_timer.
(w32_wnd_proc) <WM_EXITMENULOOP>: Set pending hourglass cursor.
(w32_wnd_proc) <WM_SETCURSOR>: Set the hourglass or current cursor.
(w32_wnd_proc) <WM_EMACS_SETCURSOR>: Set frame's current_cursor.
Only change the cursor if hourglass is not active.
(Fx_create_frame): Initialize frame's current_cursor.
(hourglass_atimer): Remove.
(hourglass_started): New function.
(start_hourglass, cancel_hourglass, hide_hourglass): Adapt to w32.
(show_hourglass): Adapt to w32, changing argument to frame.
* w32term.h (struct w32_output): Remove hourglass_window.
Add current_cursor.
* eval.c (call_debugger, Fsignal):
* keyboard.c (recursive_edit_1, cmd_error, Ftop_level)
(command_loop_1, Fread_key_sequence, Fread_key_sequence_vector)
(Fexecute_extended_command, cancel_hourglass_unwind):
* minibuf.c (read_minibuf):
* fns.c (Fy_or_n_p): Enable hourglass when HAVE_WINDOW_SYSTEM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fns.c b/src/fns.c index e0da65a93df..e89fbbc2801 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2600,7 +2600,7 @@ is nil and `use-dialog-box' is non-nil. */) xprompt = prompt; GCPRO2 (prompt, xprompt); -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_WINDOW_SYSTEM if (display_hourglass_p) cancel_hourglass (); #endif |