AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

menuitem: WOrk around deprecation warnings

Browse Source
This commit is contained in:
Benjamin Otte 2011-11-08 16:41:15 +01:00
parent a12e12a56d
commit 68bc011507
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkmenuitem.c
View File

@ -557,6 +557,21 @@ gtk_menu_item_dispose (GObject *object)
G_OBJECT_CLASS (gtk_menu_item_parent_class)->dispose (object); G_OBJECT_CLASS (gtk_menu_item_parent_class)->dispose (object);
} }
static void
gtk_menu_item_do_set_right_justified (GtkMenuItem *menu_item,
gboolean right_justified)
{
GtkMenuItemPrivate *priv = menu_item->priv;
right_justified = right_justified != FALSE;
if (priv->right_justify != right_justified)
{
priv->right_justify = right_justified;
gtk_widget_queue_resize (GTK_WIDGET (menu_item));
}
}
static void static void
gtk_menu_item_set_property (GObject *object, gtk_menu_item_set_property (GObject *object,
guint prop_id, guint prop_id,
@ -568,7 +583,7 @@ gtk_menu_item_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_RIGHT_JUSTIFIED: case PROP_RIGHT_JUSTIFIED:
gtk_menu_item_set_right_justified (menu_item, g_value_get_boolean (value)); gtk_menu_item_do_set_right_justified (menu_item, g_value_get_boolean (value));
break; break;
case PROP_SUBMENU: case PROP_SUBMENU:
gtk_menu_item_set_submenu (menu_item, g_value_get_object (value)); gtk_menu_item_set_submenu (menu_item, g_value_get_object (value));
@ -606,7 +621,7 @@ gtk_menu_item_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_RIGHT_JUSTIFIED: case PROP_RIGHT_JUSTIFIED:
g_value_set_boolean (value, gtk_menu_item_get_right_justified (menu_item)); g_value_set_boolean (value, menu_item->priv->right_justify);
break; break;
case PROP_SUBMENU: case PROP_SUBMENU:
g_value_set_object (value, gtk_menu_item_get_submenu (menu_item)); g_value_set_object (value, gtk_menu_item_get_submenu (menu_item));
@ -2278,17 +2293,9 @@ void
gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, gtk_menu_item_set_right_justified (GtkMenuItem *menu_item,
gboolean right_justified) gboolean right_justified)
{ {
GtkMenuItemPrivate *priv = menu_item->priv;
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
right_justified = right_justified != FALSE; gtk_menu_item_do_set_right_justified (menu_item, right_justified);
if (priv->right_justify != right_justified)
{
priv->right_justify = right_justified;
gtk_widget_queue_resize (GTK_WIDGET (menu_item));
}
} }
/** /**