aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGrégoire Jadi2013-07-18 19:51:36 +0200
committerGrégoire Jadi2013-07-18 19:51:36 +0200
commit84d73d4c04fea7bddfccea8c10c5aab65dc597e0 (patch)
tree6c2db733d1f6c8cff9271e6607c91ace259750ed /src
parent6fc319db18669e6fd6ea395e840e560016c2e136 (diff)
downloademacs-84d73d4c04fea7bddfccea8c10c5aab65dc597e0.tar.gz
emacs-84d73d4c04fea7bddfccea8c10c5aab65dc597e0.zip
* src/xwidget.c (xwidget_init_view): Prevent an error while displaying a
xwidget of type `cairo' but doesn't do anything useful.
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 28bb056954e..2b3034217df 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -998,6 +998,10 @@ xwidget_init_view (struct xwidget *xww,
998 //Cairo view 998 //Cairo view
999 //uhm cairo is differentish in gtk 3. 999 //uhm cairo is differentish in gtk 3.
1000 //gdk_cairo_create (gtk_widget_get_window (FRAME_GTK_WIDGET (s->f))); 1000 //gdk_cairo_create (gtk_widget_get_window (FRAME_GTK_WIDGET (s->f)));
1001 xv->widget = gtk_drawing_area_new();
1002 g_signal_connect (G_OBJECT ( xv->widget), "draw",
1003 G_CALLBACK (xwidget_osr_draw_callback), NULL);
1004
1001 } else if (EQ(xww->type, Qwebkit_osr)|| 1005 } else if (EQ(xww->type, Qwebkit_osr)||
1002 EQ(xww->type, Qsocket_osr)|| 1006 EQ(xww->type, Qsocket_osr)||
1003 (!NILP (Fget(xww->type, QCxwgir_class))))//xwgir widgets are OSR 1007 (!NILP (Fget(xww->type, QCxwgir_class))))//xwgir widgets are OSR