From d36bba293d9a169b87ff07d059db7b3897f400a2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 17 Aug 2014 03:19:59 +0200 Subject: checkbutton: Don't redundantly update states States are set properly by GtkButton, there is no need to set them manually. --- gtk/gtkcheckbutton.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gtk/gtkcheckbutton.c') diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 08c2260e08..47dc6bb100 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -529,7 +529,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, { GtkWidget *widget; GtkButton *button; - GtkStateFlags state = 0; gint x, y; gint indicator_size; gint indicator_spacing; @@ -544,7 +543,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, gtk_widget_get_allocation (widget, &allocation); baseline = gtk_widget_get_allocated_baseline (widget); context = gtk_widget_get_style_context (widget); - state = gtk_widget_get_state_flags (widget); _gtk_check_button_get_props (check_button, &indicator_size, &indicator_spacing); @@ -557,20 +555,10 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, y = CLAMP (baseline - indicator_size * button->priv->baseline_align, 0, allocation.height - indicator_size); - state &= ~(GTK_STATE_FLAG_ACTIVE | - GTK_STATE_FLAG_PRELIGHT); - - if (button->priv->activate_timeout || (button->priv->button_down && button->priv->in_button)) - state |= GTK_STATE_FLAG_ACTIVE; - - if (button->priv->in_button) - state |= GTK_STATE_FLAG_PRELIGHT; - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) x = allocation.width - (indicator_size + x); gtk_style_context_save (context); - gtk_style_context_set_state (context, state); gtk_render_background (context, cr, border_width, border_width, -- cgit v1.2.1