aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2013-07-18 13:12:45 -0700
committerJoakim Verona2013-07-18 13:12:45 -0700
commit11221267ec905fb5fa8a4712086f7da5823839b3 (patch)
tree70ebd8965f2a5f7399b4c236f1e6a83c508b9e5f /src
parentb5b5d72916a5fb0ac8be0e0c6e2c7521982735a9 (diff)
parent84d73d4c04fea7bddfccea8c10c5aab65dc597e0 (diff)
downloademacs-11221267ec905fb5fa8a4712086f7da5823839b3.tar.gz
emacs-11221267ec905fb5fa8a4712086f7da5823839b3.zip
Merge pull request #9 from daimrod/quickfix-cairo-view
* src/xwidget.c (xwidget_init_view): Prevent an error while displaying a
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 660c4ef9961..eebb17d1aed 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