AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkCheckMenuItem: remove an unused boolean field

Browse Source 
always_show_toggle was always set to TRUE in _init() and never changed
from anywhere else.  Remove it and remove the if() statements based on
it.

https://bugzilla.gnome.org/show_bug.cgi?id=699929
This commit is contained in:
Ryan Lortie 2013-05-08 08:15:40 -04:00 committed by Matthias Clasen
parent b9b196abe3
commit 434dfc20c7
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gtk/gtkcheckmenuitem.c
View File

@ -53,7 +53,6 @@
struct _GtkCheckMenuItemPrivate struct _GtkCheckMenuItemPrivate
{ {
guint active : 1; guint active : 1;
guint always_show_toggle : 1;
guint draw_as_radio : 1; guint draw_as_radio : 1;
guint inconsistent : 1; guint inconsistent : 1;
}; };
@ -467,7 +466,6 @@ gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item)
priv = check_menu_item->priv; priv = check_menu_item->priv;
priv->active = FALSE; priv->active = FALSE;
priv->always_show_toggle = TRUE;
} }
static gint static gint
@ -556,34 +554,29 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
y = (allocation.height - indicator_size) / 2; y = (allocation.height - indicator_size) / 2;
if (priv->active || gtk_style_context_save (context);
priv->always_show_toggle ||
(state & GTK_STATE_FLAG_PRELIGHT)) if (priv->inconsistent)
state |= GTK_STATE_FLAG_INCONSISTENT;
else if (priv->active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_set_state (context, state);
if (priv->draw_as_radio)
{ {
gtk_style_context_save (context); gtk_style_context_add_class (context, GTK_STYLE_CLASS_RADIO);
gtk_render_option (context, cr, x, y,
if (priv->inconsistent) indicator_size, indicator_size);
state |= GTK_STATE_FLAG_INCONSISTENT;
else if (priv->active)
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_set_state (context, state);
if (priv->draw_as_radio)
{
gtk_style_context_add_class (context, GTK_STYLE_CLASS_RADIO);
gtk_render_option (context, cr, x, y,
indicator_size, indicator_size);
}
else
{
gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
gtk_render_check (context, cr, x, y,
indicator_size, indicator_size);
}
gtk_style_context_restore (context);
} }
else
{
gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
gtk_render_check (context, cr, x, y,
indicator_size, indicator_size);
}
gtk_style_context_restore (context);
} }
} }