[gtk/present-toplevel-2] more win32 build fixes

[Matthias Clasen <matthiasc src gnome org>]

commit 852ce6cad75bd75684d915f35dc46a623a241f72
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 12 19:18:54 2020 -0400

    more win32 build fixes

 gdk/win32/gdkevents-win32.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 636ed06554..2c481de93e 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3472,8 +3472,7 @@ gdk_event_translate (MSG  *msg,
                                   (LOWORD (msg->wParam) == WA_INACTIVE ? "INACTIVE" : "???"))),
                                 HIWORD (msg->wParam) ? " minimized" : "",
                                 (HWND) msg->lParam));
-      if (window->surface_type == GDK_SURFACE_POPUP ||
-          window->surface_type == GDK_SURFACE_TEMP)
+      if (GDK_IS_POPUP (window) || GDK_IS_DRAG_SURFACE (window))
         {
           /* Popups cannot be activated or de-activated - 
            * they only support keyboard focus, which GTK
@@ -3500,8 +3499,7 @@ gdk_event_translate (MSG  *msg,
         {
           GdkSurface *other_surface = gdk_win32_handle_table_lookup ((HWND) msg->lParam);
           if (other_surface != NULL &&
-              (other_surface->surface_type == GDK_SURFACE_POPUP ||
-               other_surface->surface_type == GDK_SURFACE_TEMP))
+              (GDK_IS_POPUP (other_surface) || GDK_IS_DRAG_SURFACE (other_surface)))
             {
               /* We're being deactivated in favour of some popup or temp window.
                * Since only toplevels can have visual focus, pretend that