blob: 8e6c0b709a54d70b4762be5ca7b3f49d9e8c8123 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From e9201c0d6d9818f23c8712b2af8316f67d9d6be3 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 10 Nov 2014 14:08:20 +0000
Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only
We cannot do a type check on it if we don't have the X11 backend
compiled in.
https://bugzilla.gnome.org/show_bug.cgi?id=739885
---
gtk/gtkwindow.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0d0fb88..6cb355b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object)
{
GtkWindow *window = GTK_WINDOW (object);
GtkWindowPrivate *priv = window->priv;
+ gboolean is_plug;
G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
- if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window))
+#ifdef GDK_WINDOWING_X11
+ is_plug = GTK_IS_PLUG (window);
+#else
+ is_plug = FALSE;
+#endif
+
+ if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug)
{
priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object));
gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
--
2.1.0
|
