Remove more mir remnants
authorMatthias Clasen <mclasen@redhat.com>
Sun, 29 Dec 2019 02:52:34 +0000 (21:52 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 29 Dec 2019 02:52:34 +0000 (21:52 -0500)
The mir backend was removed a while ago, so
GDK_WINDOWING_MIR is never defined.

gdk/gdkconfig.h.meson
gtk/gtkwindow.c

index e65e3c9408c3fc4f1adbb7fe23b07b1a155b9622..80666b25f0e6ee7d07a48183cc7cb28564a7e44b 100644 (file)
@@ -14,7 +14,6 @@ G_BEGIN_DECLS
 #mesondefine GDK_WINDOWING_BROADWAY
 #mesondefine GDK_WINDOWING_WAYLAND
 #mesondefine GDK_WINDOWING_WIN32
-#mesondefine GDK_WINDOWING_MIR
 
 #mesondefine GDK_RENDERING_VULKAN
 
index a7be84d871579c1c6e6767d823756cb4df6424bd..608754aca9841a89ad84168b9ab996e101a86f55 100644 (file)
 #include "broadway/gdkbroadway.h"
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-#include "mir/gdkmir.h"
-#endif
-
 /**
  * SECTION:gtkwindow
  * @title: GtkWindow
@@ -4851,11 +4847,6 @@ gtk_window_should_use_csd (GtkWindow *window)
     }
 #endif
 
-#ifdef GDK_WINDOWING_MIR
-  if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
-    return TRUE;
-#endif
-
 #ifdef GDK_WINDOWING_WIN32
   if (g_strcmp0 (csd_env, "0") != 0 &&
       GDK_IS_WIN32_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))