summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-10-28 12:58:18 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-10-28 12:58:18 -0400
commitdd5c64488fc042d52e36961fc5fda87428a8a764 (patch)
treeeb510176440bcba46ea8c2d73f183c754902af11
parentcb0ba8b0c8d2b469d6118218d67f1216dfe4f2ad (diff)
downloadgtk+-wip/matthiasc/render-node-vfunc.tar.gz
check button: Update for new box gadget functionalitywip/matthiasc/render-node-vfunc
The box gadget now does the render node conversion for all its children, so we have less work to do.
-rw-r--r--gtk/gtkcheckbutton.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 646ea6ac1e..5d0d8af01c 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -387,28 +387,13 @@ gtk_check_button_get_render_node (GtkWidget *widget,
GskRenderer *renderer)
{
GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (GTK_CHECK_BUTTON (widget));
- GskRenderNode *res;
- GskRenderNode *node;
if (!gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON (widget)))
return GTK_WIDGET_CLASS (gtk_check_button_parent_class)->get_render_node (widget, renderer);
-
- res = gtk_css_gadget_get_render_node (priv->gadget,
- renderer,
- gtk_widget_has_visible_focus (widget));
-
- if (res == NULL)
- return NULL;
-
- node = gtk_css_gadget_get_render_node (priv->indicator_gadget,
- renderer,
- FALSE);
- gsk_render_node_append_child (res, node);
- gsk_render_node_unref (node);
-
- gtk_container_propagate_render_node (GTK_CONTAINER (widget), renderer, res);
-
- return res;
+ else
+ return gtk_css_gadget_get_render_node (priv->gadget,
+ renderer,
+ gtk_widget_has_visible_focus (widget));
}
GtkCssNode *