aboutsummaryrefslogtreecommitdiffstats
path: root/src/xwidget.c
diff options
context:
space:
mode:
authorPaul Eggert2016-04-02 17:50:03 -0700
committerPaul Eggert2016-04-02 18:32:13 -0700
commit13c8f29ce361e3aad71cf2b44e76d5cfdaf7dda3 (patch)
treebaa919aba1caa888ae7a7d6608dab59f3352df4c /src/xwidget.c
parent36e05f0bf713175a06d14255cf707543ad1a296e (diff)
downloademacs-13c8f29ce361e3aad71cf2b44e76d5cfdaf7dda3.tar.gz
emacs-13c8f29ce361e3aad71cf2b44e76d5cfdaf7dda3.zip
make-xwidget unused arg cleanup
* doc/lispref/display.texi (Xwidgets): Remove stray refs. * src/xwidget.c (syms_of_xwidget): Qwebkit, not Qwebkit_osr.
Diffstat (limited to 'src/xwidget.c')
-rw-r--r--src/xwidget.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 4f1df1aabdf..8ff4c23b1f2 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -187,7 +187,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
187 xw->widget_osr = NULL; 187 xw->widget_osr = NULL;
188 xw->plist = Qnil; 188 xw->plist = Qnil;
189 189
190 if (EQ (xw->type, Qwebkit_osr)) 190 if (EQ (xw->type, Qwebkit))
191 { 191 {
192 block_input (); 192 block_input ();
193 xw->widgetwindow_osr = gtk_offscreen_window_new (); 193 xw->widgetwindow_osr = gtk_offscreen_window_new ();
@@ -197,7 +197,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
197 /* WebKit OSR is the only scrolled component at the moment. */ 197 /* WebKit OSR is the only scrolled component at the moment. */
198 xw->widgetscrolledwindow_osr = NULL; 198 xw->widgetscrolledwindow_osr = NULL;
199 199
200 if (EQ (xw->type, Qwebkit_osr)) 200 if (EQ (xw->type, Qwebkit))
201 { 201 {
202 xw->widgetscrolledwindow_osr = gtk_scrolled_window_new (NULL, NULL); 202 xw->widgetscrolledwindow_osr = gtk_scrolled_window_new (NULL, NULL);
203 gtk_scrolled_window_set_min_content_height 203 gtk_scrolled_window_set_min_content_height
@@ -218,7 +218,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
218 gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, 218 gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width,
219 xw->height); 219 xw->height);
220 220
221 if (EQ (xw->type, Qwebkit_osr)) 221 if (EQ (xw->type, Qwebkit))
222 { 222 {
223 gtk_container_add (GTK_CONTAINER (xw->widgetwindow_osr), 223 gtk_container_add (GTK_CONTAINER (xw->widgetwindow_osr),
224 xw->widgetscrolledwindow_osr); 224 xw->widgetscrolledwindow_osr);
@@ -239,7 +239,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
239 g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, xw); 239 g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, xw);
240 240
241 /* signals */ 241 /* signals */
242 if (EQ (xw->type, Qwebkit_osr)) 242 if (EQ (xw->type, Qwebkit))
243 { 243 {
244 g_signal_connect (G_OBJECT (xw->widget_osr), 244 g_signal_connect (G_OBJECT (xw->widget_osr),
245 "document-load-finished", 245 "document-load-finished",
@@ -497,7 +497,7 @@ xwidget_init_view (struct xwidget *xww,
497 XSETWINDOW (xv->w, s->w); 497 XSETWINDOW (xv->w, s->w);
498 XSETXWIDGET (xv->model, xww); 498 XSETXWIDGET (xv->model, xww);
499 499
500 if (EQ (xww->type, Qwebkit_osr)) 500 if (EQ (xww->type, Qwebkit))
501 { 501 {
502 xv->widget = gtk_drawing_area_new (); 502 xv->widget = gtk_drawing_area_new ();
503 /* Expose event handling. */ 503 /* Expose event handling. */
@@ -508,7 +508,7 @@ xwidget_init_view (struct xwidget *xww,
508 g_signal_connect (G_OBJECT (xww->widgetwindow_osr), "damage-event", 508 g_signal_connect (G_OBJECT (xww->widgetwindow_osr), "damage-event",
509 G_CALLBACK (offscreen_damage_event), xv->widget); 509 G_CALLBACK (offscreen_damage_event), xv->widget);
510 510
511 if (EQ (xww->type, Qwebkit_osr)) 511 if (EQ (xww->type, Qwebkit))
512 { 512 {
513 g_signal_connect (G_OBJECT (xv->widget), "button-press-event", 513 g_signal_connect (G_OBJECT (xv->widget), "button-press-event",
514 G_CALLBACK (xwidget_osr_event_forward), NULL); 514 G_CALLBACK (xwidget_osr_event_forward), NULL);
@@ -983,7 +983,7 @@ syms_of_xwidget (void)
983 defsubr (&Sxwidget_webkit_goto_uri); 983 defsubr (&Sxwidget_webkit_goto_uri);
984 defsubr (&Sxwidget_webkit_execute_script); 984 defsubr (&Sxwidget_webkit_execute_script);
985 defsubr (&Sxwidget_webkit_get_title); 985 defsubr (&Sxwidget_webkit_get_title);
986 DEFSYM (Qwebkit_osr, "webkit"); 986 DEFSYM (Qwebkit, "webkit");
987 987
988 defsubr (&Sxwidget_size_request); 988 defsubr (&Sxwidget_size_request);
989 defsubr (&Sdelete_xwidget_view); 989 defsubr (&Sdelete_xwidget_view);