procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make-xwidget unused arg cleanup

Browse source 
* doc/lispref/display.texi (Xwidgets): Remove stray refs.
* src/xwidget.c (syms_of_xwidget): Qwebkit, not Qwebkit_osr.
This commit is contained in:
Paul Eggert 2016-04-02 17:50:03 -07:00
parent 36e05f0bf7
commit 13c8f29ce3
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/lispref/display.texi
View file

@ -5642,8 +5642,7 @@ in a @code{display} text or overlay property (@pxref{Display
Property}). Property}).
@defun make-xwidget type title width height arguments &optional buffer @defun make-xwidget type title width height arguments &optional buffer
This creates an xwidget object between @var{beg} and @var{end}, buffer This creates and returns an xwidget object. If
positions in @var{buffer}, and returns the new object. If
@var{buffer} is omitted or @code{nil}, it defaults to the current @var{buffer} is omitted or @code{nil}, it defaults to the current
buffer. If @var{buffer} names a buffer that doesn't exist, it will be buffer. If @var{buffer} names a buffer that doesn't exist, it will be
created. The @var{type} identifies the type of the xwidget component, created. The @var{type} identifies the type of the xwidget component,
@ -5651,7 +5650,7 @@ it can be one of the following:
@table @code @table @code
@item webkit @item webkit
The WebKit (@dfn{on-stack replacement}) component. The WebKit component.
@end table @end table
The @var{width} and @var{height} arguments specify the widget size in The @var{width} and @var{height} arguments specify the widget size in

14
src/xwidget.c
View file

@ -187,7 +187,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
xw->widget_osr = NULL; xw->widget_osr = NULL;
xw->plist = Qnil; xw->plist = Qnil;
if (EQ (xw->type, Qwebkit_osr)) if (EQ (xw->type, Qwebkit))
{ {
block_input (); block_input ();
xw->widgetwindow_osr = gtk_offscreen_window_new (); xw->widgetwindow_osr = gtk_offscreen_window_new ();
@ -197,7 +197,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
/* WebKit OSR is the only scrolled component at the moment. */ /* WebKit OSR is the only scrolled component at the moment. */
xw->widgetscrolledwindow_osr = NULL; xw->widgetscrolledwindow_osr = NULL;
if (EQ (xw->type, Qwebkit_osr)) if (EQ (xw->type, Qwebkit))
{ {
xw->widgetscrolledwindow_osr = gtk_scrolled_window_new (NULL, NULL); xw->widgetscrolledwindow_osr = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_min_content_height gtk_scrolled_window_set_min_content_height
@ -218,7 +218,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width,
xw->height); xw->height);
if (EQ (xw->type, Qwebkit_osr)) if (EQ (xw->type, Qwebkit))
{ {
gtk_container_add (GTK_CONTAINER (xw->widgetwindow_osr), gtk_container_add (GTK_CONTAINER (xw->widgetwindow_osr),
xw->widgetscrolledwindow_osr); xw->widgetscrolledwindow_osr);
@ -239,7 +239,7 @@ Returns the newly constructed xwidget, or nil if construction fails. */)
g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, xw); g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, xw);
/* signals */ /* signals */
if (EQ (xw->type, Qwebkit_osr)) if (EQ (xw->type, Qwebkit))
{ {
g_signal_connect (G_OBJECT (xw->widget_osr), g_signal_connect (G_OBJECT (xw->widget_osr),
"document-load-finished", "document-load-finished",
@ -497,7 +497,7 @@ xwidget_init_view (struct xwidget *xww,
XSETWINDOW (xv->w, s->w); XSETWINDOW (xv->w, s->w);
XSETXWIDGET (xv->model, xww); XSETXWIDGET (xv->model, xww);
if (EQ (xww->type, Qwebkit_osr)) if (EQ (xww->type, Qwebkit))
{ {
xv->widget = gtk_drawing_area_new (); xv->widget = gtk_drawing_area_new ();
/* Expose event handling. */ /* Expose event handling. */
@ -508,7 +508,7 @@ xwidget_init_view (struct xwidget *xww,
g_signal_connect (G_OBJECT (xww->widgetwindow_osr), "damage-event", g_signal_connect (G_OBJECT (xww->widgetwindow_osr), "damage-event",
G_CALLBACK (offscreen_damage_event), xv->widget); G_CALLBACK (offscreen_damage_event), xv->widget);
if (EQ (xww->type, Qwebkit_osr)) if (EQ (xww->type, Qwebkit))
{ {
g_signal_connect (G_OBJECT (xv->widget), "button-press-event", g_signal_connect (G_OBJECT (xv->widget), "button-press-event",
G_CALLBACK (xwidget_osr_event_forward), NULL); G_CALLBACK (xwidget_osr_event_forward), NULL);
@ -983,7 +983,7 @@ syms_of_xwidget (void)
defsubr (&Sxwidget_webkit_goto_uri); defsubr (&Sxwidget_webkit_goto_uri);
defsubr (&Sxwidget_webkit_execute_script); defsubr (&Sxwidget_webkit_execute_script);
defsubr (&Sxwidget_webkit_get_title); defsubr (&Sxwidget_webkit_get_title);
DEFSYM (Qwebkit_osr, "webkit"); DEFSYM (Qwebkit, "webkit");
defsubr (&Sxwidget_size_request); defsubr (&Sxwidget_size_request);
defsubr (&Sdelete_xwidget_view); defsubr (&Sdelete_xwidget_view);