*/
#include "config.h"
+
#include "gtkimagemenuitem.h"
+
#include "gtkaccellabel.h"
-#include "gtkintl.h"
#include "gtkstock.h"
#include "gtkiconfactory.h"
#include "gtkimage.h"
#include "gtkcontainer.h"
#include "gtkwindow.h"
#include "gtkactivatable.h"
+
+#include "gtkintl.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
-static void gtk_image_menu_item_destroy (GtkObject *object);
+
+
+struct _GtkImageMenuItemPrivate
+{
+ GtkWidget *image;
+
+ gchar *label;
+ guint use_stock : 1;
+ guint always_show_image : 1;
+};
+
+enum {
+ PROP_0,
+ PROP_IMAGE,
+ PROP_USE_STOCK,
+ PROP_ACCEL_GROUP,
+ PROP_ALWAYS_SHOW_IMAGE
+};
+
+static GtkActivatableIface *parent_activatable_iface;
+
+static void gtk_image_menu_item_destroy (GtkWidget *widget);
static void gtk_image_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_image_menu_item_size_allocate (GtkWidget *widget,
static void gtk_image_menu_item_recalculate (GtkImageMenuItem *image_menu_item);
static void gtk_image_menu_item_activatable_interface_init (GtkActivatableIface *iface);
-static void gtk_image_menu_item_activatable_update (GtkActivatable *activatable,
+static void gtk_image_menu_item_update (GtkActivatable *activatable,
GtkAction *action,
const gchar *property_name);
-static void gtk_image_menu_item_activatable_reset (GtkActivatable *activatable,
+static void gtk_image_menu_item_sync_action_properties (GtkActivatable *activatable,
GtkAction *action);
-typedef struct {
- gchar *label;
- guint use_stock : 1;
- guint always_show_image : 1;
-} GtkImageMenuItemPrivate;
-
-enum {
- PROP_0,
- PROP_IMAGE,
- PROP_USE_STOCK,
- PROP_ACCEL_GROUP,
- PROP_ALWAYS_SHOW_IMAGE
-};
-
-static GtkActivatableIface *parent_activatable_iface;
-
G_DEFINE_TYPE_WITH_CODE (GtkImageMenuItem, gtk_image_menu_item, GTK_TYPE_MENU_ITEM,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
gtk_image_menu_item_activatable_interface_init))
-#define GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemPrivate))
static void
gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass)
{
GObjectClass *gobject_class = (GObjectClass*) klass;
- GtkObjectClass *object_class = (GtkObjectClass*) klass;
GtkWidgetClass *widget_class = (GtkWidgetClass*) klass;
GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass;
GtkContainerClass *container_class = (GtkContainerClass*) klass;
- object_class->destroy = gtk_image_menu_item_destroy;
-
+ widget_class->destroy = gtk_image_menu_item_destroy;
widget_class->screen_changed = gtk_image_menu_item_screen_changed;
widget_class->size_request = gtk_image_menu_item_size_request;
widget_class->size_allocate = gtk_image_menu_item_size_allocate;
P_("Whether images should be shown in menus"),
TRUE,
GTK_PARAM_READWRITE));
-
-
- g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPrivate));
+ g_type_class_add_private (klass, sizeof (GtkImageMenuItemPrivate));
}
static void
gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (image_menu_item);
+ GtkImageMenuItemPrivate *priv;
- priv->use_stock = FALSE;
- priv->label = NULL;
+ image_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_menu_item,
+ GTK_TYPE_IMAGE_MENU_ITEM,
+ GtkImageMenuItemPrivate);
+ priv = image_menu_item->priv;
- image_menu_item->image = NULL;
+ priv->image = NULL;
+ priv->use_stock = FALSE;
+ priv->label = NULL;
}
static void
gtk_image_menu_item_finalize (GObject *object)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (object);
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (object)->priv;
g_free (priv->label);
priv->label = NULL;
static gboolean
show_image (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (image_menu_item);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (image_menu_item));
gboolean show;
gtk_image_menu_item_map (GtkWidget *widget)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->map (widget);
- if (image_menu_item->image)
- g_object_set (image_menu_item->image,
+ if (priv->image)
+ g_object_set (priv->image,
"visible", show_image (image_menu_item),
NULL);
}
static void
-gtk_image_menu_item_destroy (GtkObject *object)
+gtk_image_menu_item_destroy (GtkWidget *widget)
{
- GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
- if (image_menu_item->image)
+ if (priv->image)
gtk_container_remove (GTK_CONTAINER (image_menu_item),
- image_menu_item->image);
+ priv->image);
- GTK_OBJECT_CLASS (gtk_image_menu_item_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->destroy (widget);
}
static void
gint *requisition)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (menu_item);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkPackDirection pack_dir;
-
- if (GTK_IS_MENU_BAR (GTK_WIDGET (menu_item)->parent))
- pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (GTK_WIDGET (menu_item)->parent));
+ GtkWidget *parent;
+ GtkWidget *widget = GTK_WIDGET (menu_item);
+
+ parent = gtk_widget_get_parent (widget);
+
+ if (GTK_IS_MENU_BAR (parent))
+ pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
else
pack_dir = GTK_PACK_DIRECTION_LTR;
*requisition = 0;
- if (image_menu_item->image && GTK_WIDGET_VISIBLE (image_menu_item->image))
+ if (priv->image && gtk_widget_get_visible (priv->image))
{
GtkRequisition image_requisition;
guint toggle_spacing;
- gtk_widget_get_child_requisition (image_menu_item->image,
- &image_requisition);
+
+ gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL);
gtk_widget_style_get (GTK_WIDGET (menu_item),
"toggle-spacing", &toggle_spacing,
static void
gtk_image_menu_item_recalculate (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (image_menu_item);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkStockItem stock_item;
GtkWidget *image;
const gchar *resolved_label = priv->label;
if (priv->use_stock && priv->label)
{
- if (!image_menu_item->image)
+ if (!priv->image)
{
image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (image_menu_item, image);
gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
const gchar *label)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (menu_item);
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
if (priv->label != label)
{
static G_CONST_RETURN gchar *
gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
{
- GtkImageMenuItemPrivate *priv = GET_PRIVATE (menu_item);
-
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+
return priv->label;
}
gtk_image_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkImageMenuItem *image_menu_item;
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
gint child_width = 0;
gint child_height = 0;
GtkPackDirection pack_dir;
-
- if (GTK_IS_MENU_BAR (widget->parent))
- pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (widget->parent));
+ GtkWidget *parent;
+
+ parent = gtk_widget_get_parent (widget);
+
+ if (GTK_IS_MENU_BAR (parent))
+ pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
else
pack_dir = GTK_PACK_DIRECTION_LTR;
- image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
-
- if (image_menu_item->image && GTK_WIDGET_VISIBLE (image_menu_item->image))
+ if (priv->image && gtk_widget_get_visible (priv->image))
{
GtkRequisition child_requisition;
-
- gtk_widget_size_request (image_menu_item->image,
- &child_requisition);
+
+ gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
child_width = child_requisition.width;
child_height = child_requisition.height;
/* Note that GtkMenuShell always size requests before
* toggle_size_request, so toggle_size_request will be able to use
- * image_menu_item->image->requisition
+ * priv->image->requisition
*/
}
gtk_image_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkImageMenuItem *image_menu_item;
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
+ GtkAllocation widget_allocation;
GtkPackDirection pack_dir;
-
- if (GTK_IS_MENU_BAR (widget->parent))
- pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (widget->parent));
+ GtkWidget *parent;
+
+ parent = gtk_widget_get_parent (widget);
+
+ if (GTK_IS_MENU_BAR (parent))
+ pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
else
pack_dir = GTK_PACK_DIRECTION_LTR;
-
- image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_allocate (widget, allocation);
- if (image_menu_item->image && GTK_WIDGET_VISIBLE (image_menu_item->image))
+ if (priv->image && gtk_widget_get_visible (priv->image))
{
gint x, y, offset;
GtkRequisition child_requisition;
* come up with a solution that's really better.
*/
- gtk_widget_get_child_requisition (image_menu_item->image,
- &child_requisition);
+ gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
+
+ gtk_widget_get_allocation (widget, &widget_allocation);
if (pack_dir == GTK_PACK_DIRECTION_LTR ||
pack_dir == GTK_PACK_DIRECTION_RTL)
{
- offset = GTK_CONTAINER (image_menu_item)->border_width +
- widget->style->xthickness;
-
+ offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item)) +
+ gtk_widget_get_style (widget)->xthickness;
+
if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
(pack_dir == GTK_PACK_DIRECTION_LTR))
x = offset + horizontal_padding +
(GTK_MENU_ITEM (image_menu_item)->toggle_size -
toggle_spacing - child_requisition.width) / 2;
else
- x = widget->allocation.width - offset - horizontal_padding -
+ x = widget_allocation.width - offset - horizontal_padding -
GTK_MENU_ITEM (image_menu_item)->toggle_size + toggle_spacing +
(GTK_MENU_ITEM (image_menu_item)->toggle_size -
toggle_spacing - child_requisition.width) / 2;
-
- y = (widget->allocation.height - child_requisition.height) / 2;
+
+ y = (widget_allocation.height - child_requisition.height) / 2;
}
else
{
- offset = GTK_CONTAINER (image_menu_item)->border_width +
- widget->style->ythickness;
-
+ offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item)) +
+ gtk_widget_get_style (widget)->ythickness;
+
if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
(pack_dir == GTK_PACK_DIRECTION_TTB))
y = offset + horizontal_padding +
(GTK_MENU_ITEM (image_menu_item)->toggle_size -
toggle_spacing - child_requisition.height) / 2;
else
- y = widget->allocation.height - offset - horizontal_padding -
+ y = widget_allocation.height - offset - horizontal_padding -
GTK_MENU_ITEM (image_menu_item)->toggle_size + toggle_spacing +
(GTK_MENU_ITEM (image_menu_item)->toggle_size -
toggle_spacing - child_requisition.height) / 2;
- x = (widget->allocation.width - child_requisition.width) / 2;
+ x = (widget_allocation.width - child_requisition.width) / 2;
}
child_allocation.width = child_requisition.width;
child_allocation.height = child_requisition.height;
- child_allocation.x = widget->allocation.x + MAX (x, 0);
- child_allocation.y = widget->allocation.y + MAX (y, 0);
+ child_allocation.x = widget_allocation.x + MAX (x, 0);
+ child_allocation.y = widget_allocation.y + MAX (y, 0);
- gtk_widget_size_allocate (image_menu_item->image, &child_allocation);
+ gtk_widget_size_allocate (priv->image, &child_allocation);
}
}
gpointer callback_data)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container,
include_internals,
callback,
callback_data);
- if (include_internals && image_menu_item->image)
- (* callback) (image_menu_item->image, callback_data);
+ if (include_internals && priv->image)
+ (* callback) (priv->image, callback_data);
}
gtk_image_menu_item_activatable_interface_init (GtkActivatableIface *iface)
{
parent_activatable_iface = g_type_interface_peek_parent (iface);
- iface->update = gtk_image_menu_item_activatable_update;
- iface->reset = gtk_image_menu_item_activatable_reset;
+ iface->update = gtk_image_menu_item_update;
+ iface->sync_action_properties = gtk_image_menu_item_sync_action_properties;
}
static gboolean
}
}
-static void
-gtk_image_menu_item_activatable_update (GtkActivatable *activatable,
- GtkAction *action,
- const gchar *property_name)
+static void
+gtk_image_menu_item_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name)
{
GtkImageMenuItem *image_menu_item;
- GtkWidget *image;
gboolean use_appearance;
image_menu_item = GTK_IMAGE_MENU_ITEM (activatable);
}
static void
-gtk_image_menu_item_activatable_reset (GtkActivatable *activatable,
- GtkAction *action)
+gtk_image_menu_item_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action)
{
GtkImageMenuItem *image_menu_item;
GtkWidget *image;
image_menu_item = GTK_IMAGE_MENU_ITEM (activatable);
- parent_activatable_iface->reset (activatable, action);
+ parent_activatable_iface->sync_action_properties (activatable, action);
if (!action)
return;
!activatable_update_gicon (image_menu_item, action))
activatable_update_icon_name (image_menu_item, action);
+ gtk_image_menu_item_set_always_show_image (image_menu_item,
+ gtk_action_get_always_show_image (action));
}
/**
* gtk_image_menu_item_new_from_stock:
* @stock_id: the name of the stock item.
- * @accel_group: the #GtkAccelGroup to add the menu items accelerator to,
- * or %NULL.
+ * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items
+ * accelerator to, or %NULL.
* @returns: a new #GtkImageMenuItem.
*
* Creates a new #GtkImageMenuItem containing the image and text from a
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
- priv = GET_PRIVATE (image_menu_item);
+ priv = image_menu_item->priv;
if (priv->use_stock != use_stock)
{
gboolean
gtk_image_menu_item_get_use_stock (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPrivate *priv;
-
g_return_val_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item), FALSE);
- priv = GET_PRIVATE (image_menu_item);
-
- return priv->use_stock;
+ return image_menu_item->priv->use_stock;
}
/**
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
- priv = GET_PRIVATE (image_menu_item);
+ priv = image_menu_item->priv;
if (priv->always_show_image != always_show)
{
priv->always_show_image = always_show;
- if (image_menu_item->image)
+ if (priv->image)
{
if (show_image (image_menu_item))
- gtk_widget_show (image_menu_item->image);
+ gtk_widget_show (priv->image);
else
- gtk_widget_hide (image_menu_item->image);
+ gtk_widget_hide (priv->image);
}
g_object_notify (G_OBJECT (image_menu_item), "always-show-image");
/**
* gtk_image_menu_item_get_always_show_image:
* @image_menu_item: a #GtkImageMenuItem
- * @always_show: %TRUE if the menuitem should always show the image
*
- * Returns whether the menu item will ignore the #GtkSettings:gtk-menu-images
+ * Returns whether the menu item will ignore the #GtkSettings:gtk-menu-images
* setting and always show the image, if available.
*
* Returns: %TRUE if the menu item will always show the image
gboolean
gtk_image_menu_item_get_always_show_image (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPrivate *priv;
-
g_return_val_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item), FALSE);
- priv = GET_PRIVATE (image_menu_item);
-
- return priv->always_show_image;
+ return image_menu_item->priv->always_show_image;
}
gtk_image_menu_item_set_accel_group (GtkImageMenuItem *image_menu_item,
GtkAccelGroup *accel_group)
{
- GtkImageMenuItemPrivate *priv;
+ GtkImageMenuItemPrivate *priv;
GtkStockItem stock_item;
/* Silent return for the constructor */
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
- priv = GET_PRIVATE (image_menu_item);
+ priv = image_menu_item->priv;
if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item))
if (stock_item.keyval)
/**
* gtk_image_menu_item_set_image:
* @image_menu_item: a #GtkImageMenuItem.
- * @image: a widget to set as the image for the menu item.
- *
+ * @image: (allow-none): a widget to set as the image for the menu item.
+ *
* Sets the image of @image_menu_item to the given widget.
* Note that it depends on the show-menu-images setting whether
* the image will be displayed or not.
gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item,
GtkWidget *image)
{
+ GtkImageMenuItemPrivate *priv;
+
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
- if (image == image_menu_item->image)
+ priv = image_menu_item->priv;
+
+ if (image == priv->image)
return;
- if (image_menu_item->image)
+ if (priv->image)
gtk_container_remove (GTK_CONTAINER (image_menu_item),
- image_menu_item->image);
+ priv->image);
- image_menu_item->image = image;
+ priv->image = image;
if (image == NULL)
return;
/**
* gtk_image_menu_item_get_image:
- * @image_menu_item: a #GtkImageMenuItem.
- * @returns: the widget set as image of @image_menu_item.
+ * @image_menu_item: a #GtkImageMenuItem
*
* Gets the widget that is currently set as the image of @image_menu_item.
* See gtk_image_menu_item_set_image().
+ *
+ * Return value: (transfer none): the widget set as image of @image_menu_item
**/
GtkWidget*
gtk_image_menu_item_get_image (GtkImageMenuItem *image_menu_item)
{
g_return_val_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item), NULL);
- return image_menu_item->image;
+ return image_menu_item->priv->image;
}
static void
gtk_image_menu_item_remove (GtkContainer *container,
GtkWidget *child)
{
- GtkImageMenuItem *image_menu_item;
-
- image_menu_item = GTK_IMAGE_MENU_ITEM (container);
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
- if (child == image_menu_item->image)
+ if (child == priv->image)
{
gboolean widget_was_visible;
- widget_was_visible = GTK_WIDGET_VISIBLE (child);
+ widget_was_visible = gtk_widget_get_visible (child);
gtk_widget_unparent (child);
- image_menu_item->image = NULL;
-
- if (GTK_WIDGET_VISIBLE (container) && widget_was_visible)
+ priv->image = NULL;
+
+ if (widget_was_visible &&
+ gtk_widget_get_visible (GTK_WIDGET (container)))
gtk_widget_queue_resize (GTK_WIDGET (container));
g_object_notify (G_OBJECT (image_menu_item), "image");
static void
show_image_change_notify (GtkImageMenuItem *image_menu_item)
{
- if (image_menu_item->image)
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
+
+ if (priv->image)
{
if (show_image (image_menu_item))
- gtk_widget_show (image_menu_item->image);
+ gtk_widget_show (priv->image);
else
- gtk_widget_hide (image_menu_item->image);
+ gtk_widget_hide (priv->image);
}
}
show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
}
-
-#define __GTK_IMAGE_MENU_ITEM_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff