=== modified file 'src/w32fns.c'
--- src/w32fns.c	2014-06-29 16:12:08 +0000
+++ src/w32fns.c	2014-07-03 10:28:58 +0000
@@ -5501,27 +5501,13 @@
  ***********************************************************************/
 
 void
-w32_note_current_window (void)
-{
-  struct frame * f = SELECTED_FRAME ();
-
-  if (!FRAME_W32_P (f))
-    return;
-
-  hourglass_hwnd = FRAME_W32_WINDOW (f);
-}
-
-void
 show_hourglass (struct atimer *timer)
 {
-  struct frame *f;
+  struct frame *f = (struct frame *) timer->client_data;
 
   hourglass_atimer = NULL;
 
   block_input ();
-  f = x_window_to_frame (&one_w32_display_info,
-				       hourglass_hwnd);
-
   if (f)
     f->output_data.w32->hourglass_p = 0;
   else

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2014-07-03 06:00:53 +0000
+++ src/xdisp.c	2014-07-03 10:29:14 +0000
@@ -30683,15 +30683,8 @@
   else
     delay = make_timespec (DEFAULT_HOURGLASS_DELAY, 0);
 
-#ifdef HAVE_NTGUI
-  {
-    extern void w32_note_current_window (void);
-    w32_note_current_window ();
-  }
-#endif /* HAVE_NTGUI */
-
   hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
-				   show_hourglass, NULL);
+				   show_hourglass, SELECTED_FRAME ());
 }