gdkevents-win32.c: Avoid crash in SetTimer()

Since we only support a single GdkDisplay for Windows, make use of it to
ensure we always obtain a proper GdkDisplay to check whether a modal
operation is in progress.

This should fix issue #7147.

gdk/win32/gdkevents-win32.c

@@ -1365,7 +1365,9 @@ modal_timer_proc (HWND     hwnd,
 		  DWORD    time)
 {
   int arbitrary_limit = 10;
-  GdkWin32Display *display = GDK_WIN32_DISPLAY (gdk_surface_get_display (GDK_SURFACE (id)));
+
+  /* todo: if we support multiple GdkDisplay's on Windows? */
+  GdkWin32Display *display = GDK_WIN32_DISPLAY (gdk_display_get_default ());
 
   while (display->display_surface_record->modal_operation_in_progress != GDK_WIN32_MODAL_OP_NONE &&
 	 g_main_context_pending (NULL) &&

gsk/gskrendernodeparser.c

@@ -2638,11 +2638,11 @@ unpack_glyphs (PangoFont        *font,
         }
       else
         {
-          PangoRectangle ink_rect;
+          PangoRectangle rect;
 
-          pango_font_get_glyph_extents (font, gi->glyph, &ink_rect, NULL);
+          pango_font_get_glyph_extents (font, gi->glyph, NULL, &rect);
 
-          gi->geometry.width = ink_rect.width;
+          gi->geometry.width = rect.width;
         }
     }
 

testsuite/gsk/nodeparser/text.ref.node

@@ -1,6 +1,6 @@
 text {
   color: rgb(50,50,50);
   font: "Cantarell 14px";
-  glyphs: "N", 430 4.2002, 406 6.10352, 417 7, 772 4, 783 5, 783 5, 793 6 0 0 same-cluster;
+  glyphs: "Ntp", 417 7, 772 4, 783 5, 783 5, 793 6 0 0 same-cluster;
   offset: 0 32.0186;
 }