callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu item: Convert to g_object_notify_by_pspec

Browse Source 
This avoids pspec lookup overhead in g_object_notify.
This commit is contained in:
Matthias Clasen
2015-09-06 15:43:01 -04:00
parent 8ee711bbc9
commit c0d9e3a1ad
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
gtk/gtkmenuitem.c
View File

@ -106,8 +106,10 @@ enum {
PROP_LABEL, PROP_LABEL,
PROP_USE_UNDERLINE, PROP_USE_UNDERLINE,
LAST_PROP,
/* activatable properties */ /* activatable properties */
PROP_ACTIVATABLE_RELATED_ACTION, PROP_ACTIVATABLE_RELATED_ACTION = LAST_PROP,
PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE,
PROP_ACTION_NAME, PROP_ACTION_NAME,
@ -206,6 +208,7 @@ static void gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu
gboolean use_appearance); gboolean use_appearance);
static guint menu_item_signals[LAST_SIGNAL] = { 0 }; static guint menu_item_signals[LAST_SIGNAL] = { 0 };
static GParamSpec *menu_item_props[LAST_PROP];
static GtkBuildableIface *parent_buildable_iface; static GtkBuildableIface *parent_buildable_iface;
@ -391,13 +394,12 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
* *
* Since: 2.14 * Since: 2.14
*/ */
g_object_class_install_property (gobject_class, menu_item_props[PROP_RIGHT_JUSTIFIED] =
PROP_RIGHT_JUSTIFIED, g_param_spec_boolean ("right-justified",
g_param_spec_boolean ("right-justified", P_("Right Justified"),
P_("Right Justified"), P_("Sets whether the menu item appears justified at the right side of a menu bar"),
P_("Sets whether the menu item appears justified at the right side of a menu bar"), FALSE,
FALSE, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED));
/** /**
* GtkMenuItem:submenu: * GtkMenuItem:submenu:
@ -406,13 +408,12 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
* *
* Since: 2.12 * Since: 2.12
*/ */
g_object_class_install_property (gobject_class, menu_item_props[PROP_SUBMENU] =
PROP_SUBMENU, g_param_spec_object ("submenu",
g_param_spec_object ("submenu", P_("Submenu"),
P_("Submenu"), P_("The submenu attached to the menu item, or NULL if it has none"),
P_("The submenu attached to the menu item, or NULL if it has none"), GTK_TYPE_MENU,
GTK_TYPE_MENU, GTK_PARAM_READWRITE);
GTK_PARAM_READWRITE));
/** /**
* GtkMenuItem:accel-path: * GtkMenuItem:accel-path:
@ -423,13 +424,12 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
* *
* Since: 2.14 * Since: 2.14
*/ */
g_object_class_install_property (gobject_class, menu_item_props[PROP_ACCEL_PATH] =
PROP_ACCEL_PATH, g_param_spec_string ("accel-path",
g_param_spec_string ("accel-path", P_("Accel Path"),
P_("Accel Path"), P_("Sets the accelerator path of the menu item"),
P_("Sets the accelerator path of the menu item"), NULL,
NULL, GTK_PARAM_READWRITE);
GTK_PARAM_READWRITE));
/** /**
* GtkMenuItem:label: * GtkMenuItem:label:
@ -438,13 +438,12 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
* *
* Since: 2.16 * Since: 2.16
*/ */
g_object_class_install_property (gobject_class, menu_item_props[PROP_LABEL] =
PROP_LABEL, g_param_spec_string ("label",
g_param_spec_string ("label", P_("Label"),
P_("Label"), P_("The text for the child label"),
P_("The text for the child label"), "",
"", GTK_PARAM_READWRITE);
GTK_PARAM_READWRITE));
/** /**
* GtkMenuItem:use-underline: * GtkMenuItem:use-underline:
@ -453,15 +452,16 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
* *
* Since: 2.16 * Since: 2.16
*/ */
g_object_class_install_property (gobject_class, menu_item_props[PROP_USE_UNDERLINE] =
PROP_USE_UNDERLINE, g_param_spec_boolean ("use-underline",
g_param_spec_boolean ("use-underline", P_("Use underline"),
P_("Use underline"), P_("If set, an underline in the text indicates "
P_("If set, an underline in the text indicates " "the next character should be used for the "
"the next character should be used for the " "mnemonic accelerator key"),
"mnemonic accelerator key"), FALSE,
FALSE, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
g_object_class_install_properties (gobject_class, LAST_PROP, menu_item_props);
g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action"); g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action");
g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance"); g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance");
@ -649,7 +649,7 @@ gtk_menu_item_do_set_right_justified (GtkMenuItem *menu_item,
{ {
priv->right_justify = right_justified; priv->right_justify = right_justified;
gtk_widget_queue_resize (GTK_WIDGET (menu_item)); gtk_widget_queue_resize (GTK_WIDGET (menu_item));
g_object_notify (G_OBJECT (menu_item), "right-justified"); g_object_notify_by_pspec (G_OBJECT (menu_item), menu_item_props[PROP_RIGHT_JUSTIFIED]);
} }
} }
@ -1340,7 +1340,7 @@ gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
if (gtk_widget_get_parent (GTK_WIDGET (menu_item))) if (gtk_widget_get_parent (GTK_WIDGET (menu_item)))
gtk_widget_queue_resize (GTK_WIDGET (menu_item)); gtk_widget_queue_resize (GTK_WIDGET (menu_item));
g_object_notify (G_OBJECT (menu_item), "submenu"); g_object_notify_by_pspec (G_OBJECT (menu_item), menu_item_props[PROP_SUBMENU]);
} }
} }
@ -1868,7 +1868,7 @@ gtk_real_menu_item_set_label (GtkMenuItem *menu_item,
{ {
gtk_label_set_label (GTK_LABEL (child), label ? label : ""); gtk_label_set_label (GTK_LABEL (child), label ? label : "");
g_object_notify (G_OBJECT (menu_item), "label"); g_object_notify_by_pspec (G_OBJECT (menu_item), menu_item_props[PROP_LABEL]);
} }
} }
@ -2581,7 +2581,7 @@ gtk_menu_item_set_use_underline (GtkMenuItem *menu_item,
gtk_label_get_use_underline (GTK_LABEL (child)) != setting) gtk_label_get_use_underline (GTK_LABEL (child)) != setting)
{ {
gtk_label_set_use_underline (GTK_LABEL (child), setting); gtk_label_set_use_underline (GTK_LABEL (child), setting);
g_object_notify (G_OBJECT (menu_item), "use-underline"); g_object_notify_by_pspec (G_OBJECT (menu_item), menu_item_props[PROP_USE_UNDERLINE]);
} }
} }