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