summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2010-12-22 16:14:09 +0100
committerKristian Rietveld <kris@gtk.org>2010-12-22 16:14:09 +0100
commit76b565d2414f66a7a4f045acd31a4eda1d863b41 (patch)
tree09d189925ab6cbffbcb833c70f3a3d0bb8070696
parent1556453cc5029d7c8a93fb6b9cb9a1b6f45f430a (diff)
downloadgtk+-76b565d2414f66a7a4f045acd31a4eda1d863b41.tar.gz
GdkDisplayManager: register Quartz backend when applicable
-rw-r--r--gdk/gdkdisplaymanager.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 97022d5a22..4c61b6a669 100644
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -36,6 +36,10 @@
#include "x11/gdkx.h"
#endif
+#ifdef GDK_WINDOWING_QUARTZ
+#include "quartz/gdkdisplaymanager-quartz.h"
+#endif
+
/**
* SECTION:gdkdisplaymanager
@@ -177,6 +181,11 @@ gdk_display_manager_get (void)
manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
else
#endif
+#ifdef GDK_WINDOWING_QUARTZ
+ if (backend == NULL || strcmp (backend, "quartz") == 0)
+ manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL);
+ else
+#endif
if (backend != NULL)
g_error ("Unsupported GDK backend: %s", backend);
else