* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
*/
#include "config.h"
+
#include "gtkimagemenuitem.h"
+
+#include "gtkmenuitemprivate.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);
-static void gtk_image_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+
+/**
+ * SECTION:gtkimagemenuitem
+ * @Short_description: A menu item with an icon
+ * @Title: GtkImageMenuItem
+ *
+ * A GtkImageMenuItem is a menu item which has an icon next to the text label.
+ *
+ * Note that the user can disable display of menu icons, so make sure to still
+ * fill in the text label.
+ */
+
+
+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_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_image_menu_item_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_image_menu_item_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural);
static void gtk_image_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_image_menu_item_map (GtkWidget *widget);
static void gtk_image_menu_item_remove (GtkContainer *container,
GtkWidget *child);
static void gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
- gint *requisition);
+ gint *requisition);
static void gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
- const gchar *label);
-static G_CONST_RETURN gchar *gtk_image_menu_item_get_label (GtkMenuItem *menu_item);
+ const gchar *label);
+static const gchar * gtk_image_menu_item_get_label (GtkMenuItem *menu_item);
static void gtk_image_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
- GtkCallback callback,
- gpointer callback_data);
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
static void gtk_image_menu_item_finalize (GObject *object);
static void gtk_image_menu_item_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void gtk_image_menu_item_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_image_menu_item_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen);
+ GdkScreen *previous_screen);
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_update (GtkActivatable *activatable,
- GtkAction *action,
- const gchar *property_name);
+ GtkAction *action,
+ const gchar *property_name);
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;
+ GtkAction *action);
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))
+ 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->get_preferred_width = gtk_image_menu_item_get_preferred_width;
+ widget_class->get_preferred_height = gtk_image_menu_item_get_preferred_height;
+ widget_class->get_preferred_height_for_width = gtk_image_menu_item_get_preferred_height_for_width;
widget_class->size_allocate = gtk_image_menu_item_size_allocate;
widget_class->map = gtk_image_menu_item_map;
container_class->forall = gtk_image_menu_item_forall;
container_class->remove = gtk_image_menu_item_remove;
-
+
menu_item_class->toggle_size_request = gtk_image_menu_item_toggle_size_request;
menu_item_class->set_label = gtk_image_menu_item_set_label;
menu_item_class->get_label = gtk_image_menu_item_get_label;
gobject_class->finalize = gtk_image_menu_item_finalize;
gobject_class->set_property = gtk_image_menu_item_set_property;
gobject_class->get_property = gtk_image_menu_item_get_property;
-
+
g_object_class_install_property (gobject_class,
PROP_IMAGE,
g_param_spec_object ("image",
* stock id to select the stock item for the item.
*
* Since: 2.16
- **/
+ */
g_object_class_install_property (gobject_class,
PROP_USE_STOCK,
g_param_spec_boolean ("use-stock",
- P_("Use stock"),
- P_("Whether to use the label text to create a stock menu item"),
- FALSE,
- GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ P_("Use stock"),
+ P_("Whether to use the label text to create a stock menu item"),
+ FALSE,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
/**
* GtkImageMenuItem:always-show-image:
*
- * If %TRUE, the menu item will ignore the #GtkSettings:gtk-menu-images
+ * If %TRUE, the menu item will ignore the #GtkSettings:gtk-menu-images
* setting and always show the image, if available.
*
* Use this property if the menuitem would be useless or hard to use
- * without the image.
+ * without the image.
*
* Since: 2.16
- **/
+ */
g_object_class_install_property (gobject_class,
PROP_ALWAYS_SHOW_IMAGE,
g_param_spec_boolean ("always-show-image",
- P_("Always show image"),
- P_("Whether the image will always be shown"),
- FALSE,
- GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ P_("Always show image"),
+ P_("Whether the image will always be shown"),
+ FALSE,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
/**
* GtkImageMenuItem:accel-group:
* The Accel Group to use for stock accelerator keys
*
* Since: 2.16
- **/
+ */
g_object_class_install_property (gobject_class,
PROP_ACCEL_GROUP,
g_param_spec_object ("accel-group",
- P_("Accel Group"),
- P_("The Accel Group to use for stock accelerator keys"),
- GTK_TYPE_ACCEL_GROUP,
- GTK_PARAM_WRITABLE));
-
- gtk_settings_install_property (g_param_spec_boolean ("gtk-menu-images",
- P_("Show menu images"),
- P_("Whether images should be shown in menus"),
- TRUE,
- GTK_PARAM_READWRITE));
-
-
- g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPrivate));
+ P_("Accel Group"),
+ P_("The Accel Group to use for stock accelerator keys"),
+ GTK_TYPE_ACCEL_GROUP,
+ GTK_PARAM_WRITABLE));
+ 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
+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;
GParamSpec *pspec)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
-
+
switch (prop_id)
{
case PROP_IMAGE:
GParamSpec *pspec)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
-
+
switch (prop_id)
{
case PROP_IMAGE:
g_value_set_object (value, gtk_image_menu_item_get_image (image_menu_item));
break;
case PROP_USE_STOCK:
- g_value_set_boolean (value, gtk_image_menu_item_get_use_stock (image_menu_item));
+ g_value_set_boolean (value, gtk_image_menu_item_get_use_stock (image_menu_item));
break;
case PROP_ALWAYS_SHOW_IMAGE:
g_value_set_boolean (value, gtk_image_menu_item_get_always_show_image (image_menu_item));
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
gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
- gint *requisition)
+ 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,
- NULL);
-
+ "toggle-spacing", &toggle_spacing,
+ NULL);
+
if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL)
- {
- if (image_requisition.width > 0)
- *requisition = image_requisition.width + toggle_spacing;
- }
+ {
+ if (image_requisition.width > 0)
+ *requisition = image_requisition.width + toggle_spacing;
+ }
else
- {
- if (image_requisition.height > 0)
- *requisition = image_requisition.height + toggle_spacing;
- }
+ {
+ if (image_requisition.height > 0)
+ *requisition = image_requisition.height + 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)
- {
- image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (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);
+ }
if (gtk_stock_lookup (priv->label, &stock_item))
- resolved_label = stock_item.label;
+ resolved_label = stock_item.label;
- gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE);
+ gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE);
}
GTK_MENU_ITEM_CLASS
}
-static void
+static void
gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
- const gchar *label)
+ 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 *
+static const 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;
}
static void
-gtk_image_menu_item_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_image_menu_item_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
- GtkImageMenuItem *image_menu_item;
- gint child_width = 0;
- gint child_height = 0;
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
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)->get_preferred_width (widget, minimum, natural);
- if (image_menu_item->image && GTK_WIDGET_VISIBLE (image_menu_item->image))
+ if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
+ priv->image &&
+ gtk_widget_get_visible (priv->image))
+ {
+ gint child_minimum, child_natural;
+
+ gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural);
+
+ *minimum = MAX (*minimum, child_minimum);
+ *natural = MAX (*natural, child_natural);
+ }
+}
+
+static void
+gtk_image_menu_item_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
+ gint child_height = 0;
+ GtkPackDirection pack_dir;
+ 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;
+
+ if (priv->image && gtk_widget_get_visible (priv->image))
{
GtkRequisition child_requisition;
-
- gtk_widget_size_request (image_menu_item->image,
- &child_requisition);
- child_width = child_requisition.width;
+ gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
+
child_height = child_requisition.height;
}
- GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->size_request (widget, requisition);
+ GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural);
- /* not done with height since that happens via the
- * toggle_size_request
- */
- if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL)
- requisition->height = MAX (requisition->height, child_height);
+ if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
+ {
+ *minimum = MAX (*minimum, child_height);
+ *natural = MAX (*natural, child_height);
+ }
+}
+
+static void
+gtk_image_menu_item_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural)
+{
+ GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
+ gint child_height = 0;
+ GtkPackDirection pack_dir;
+ 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
- requisition->width = MAX (requisition->width, child_width);
-
-
- /* Note that GtkMenuShell always size requests before
- * toggle_size_request, so toggle_size_request will be able to use
- * image_menu_item->image->requisition
- */
+ pack_dir = GTK_PACK_DIRECTION_LTR;
+
+ if (priv->image && gtk_widget_get_visible (priv->image))
+ {
+ GtkRequisition child_requisition;
+
+ gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);
+
+ child_height = child_requisition.height;
+ }
+
+ GTK_WIDGET_CLASS
+ (gtk_image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural);
+
+ if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR)
+ {
+ *minimum = MAX (*minimum, child_height);
+ *natural = MAX (*natural, child_height);
+ }
}
+
static void
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;
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GtkBorder padding;
GtkRequisition child_requisition;
GtkAllocation child_allocation;
guint horizontal_padding, toggle_spacing;
+ gint toggle_size;
+ toggle_size = GTK_MENU_ITEM (image_menu_item)->priv->toggle_size;
gtk_widget_style_get (widget,
- "horizontal-padding", &horizontal_padding,
- "toggle-spacing", &toggle_spacing,
- NULL);
-
+ "horizontal-padding", &horizontal_padding,
+ "toggle-spacing", &toggle_spacing,
+ NULL);
+
/* Man this is lame hardcoding action, but I can't
* 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);
+
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_get_padding (context, state, &padding);
+ offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item));
if (pack_dir == GTK_PACK_DIRECTION_LTR ||
- pack_dir == GTK_PACK_DIRECTION_RTL)
- {
- offset = GTK_CONTAINER (image_menu_item)->border_width +
- widget->style->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 -
- 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;
- }
+ pack_dir == GTK_PACK_DIRECTION_RTL)
+ {
+ if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
+ (pack_dir == GTK_PACK_DIRECTION_LTR))
+ x = offset + horizontal_padding + padding.left +
+ (toggle_size - toggle_spacing - child_requisition.width) / 2;
+ else
+ x = widget_allocation.width - offset - horizontal_padding - padding.right -
+ toggle_size + toggle_spacing +
+ (toggle_size - toggle_spacing - child_requisition.width) / 2;
+
+ y = (widget_allocation.height - child_requisition.height) / 2;
+ }
else
- {
- offset = GTK_CONTAINER (image_menu_item)->border_width +
- widget->style->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 -
- 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;
- }
-
+ {
+ if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
+ (pack_dir == GTK_PACK_DIRECTION_TTB))
+ y = offset + horizontal_padding + padding.top +
+ (toggle_size - toggle_spacing - child_requisition.height) / 2;
+ else
+ y = widget_allocation.height - offset - horizontal_padding - padding.bottom -
+ toggle_size + toggle_spacing +
+ (toggle_size - toggle_spacing - child_requisition.height) / 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);
}
}
static void
gtk_image_menu_item_forall (GtkContainer *container,
- gboolean include_internals,
+ gboolean include_internals,
GtkCallback callback,
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);
}
-static void
+static void
gtk_image_menu_item_activatable_interface_init (GtkActivatableIface *iface)
{
parent_activatable_iface = g_type_interface_peek_parent (iface);
const gchar *stock_id = gtk_action_get_stock_id (action);
image = gtk_image_menu_item_get_image (image_menu_item);
-
+
if (GTK_IS_IMAGE (image) &&
stock_id && gtk_icon_factory_lookup_default (stock_id))
{
const gchar *icon_name = gtk_action_get_icon_name (action);
image = gtk_image_menu_item_get_image (image_menu_item);
-
- if (GTK_IS_IMAGE (image) &&
+
+ if (GTK_IS_IMAGE (image) &&
(gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY ||
gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME))
{
static void
gtk_image_menu_item_update (GtkActivatable *activatable,
- GtkAction *action,
- const gchar *property_name)
+ GtkAction *action,
+ const gchar *property_name)
{
GtkImageMenuItem *image_menu_item;
- GtkWidget *image;
gboolean use_appearance;
image_menu_item = GTK_IMAGE_MENU_ITEM (activatable);
activatable_update_icon_name (image_menu_item, action);
}
-static void
+static void
gtk_image_menu_item_sync_action_properties (GtkActivatable *activatable,
- GtkAction *action)
+ GtkAction *action)
{
GtkImageMenuItem *image_menu_item;
GtkWidget *image;
gtk_image_menu_item_set_image (image_menu_item, NULL);
image = NULL;
}
-
+
if (!image)
{
image = gtk_image_new ();
gtk_widget_show (image);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (activatable),
- image);
+ image);
}
-
+
if (!activatable_update_stock_id (image_menu_item, action) &&
!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:
- * @returns: a new #GtkImageMenuItem.
*
* Creates a new #GtkImageMenuItem with an empty label.
- **/
+ *
+ * Returns: a new #GtkImageMenuItem
+ */
GtkWidget*
gtk_image_menu_item_new (void)
{
/**
* gtk_image_menu_item_new_with_label:
* @label: the text of the menu item.
- * @returns: a new #GtkImageMenuItem.
*
- * Creates a new #GtkImageMenuItem containing a label.
- **/
+ * Creates a new #GtkImageMenuItem containing a label.
+ *
+ * Returns: a new #GtkImageMenuItem.
+ */
GtkWidget*
gtk_image_menu_item_new_with_label (const gchar *label)
{
- return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
- "label", label,
- NULL);
+ return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
+ "label", label,
+ NULL);
}
-
/**
* gtk_image_menu_item_new_with_mnemonic:
* @label: the text of the menu item, with an underscore in front of the
* mnemonic character
- * @returns: a new #GtkImageMenuItem
*
* Creates a new #GtkImageMenuItem containing a label. The label
* will be created using gtk_label_new_with_mnemonic(), so underscores
* in @label indicate the mnemonic for the menu item.
- **/
+ *
+ * Returns: a new #GtkImageMenuItem
+ */
GtkWidget*
gtk_image_menu_item_new_with_mnemonic (const gchar *label)
{
- return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
- "use-underline", TRUE,
- "label", label,
- NULL);
+ return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
+ "use-underline", TRUE,
+ "label", label,
+ NULL);
}
/**
* 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.
- * @returns: a new #GtkImageMenuItem.
+ * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items
+ * accelerator to, or %NULL.
*
- * Creates a new #GtkImageMenuItem containing the image and text from a
- * stock item. Some stock ids have preprocessor macros like #GTK_STOCK_OK
+ * Creates a new #GtkImageMenuItem containing the image and text from a
+ * stock item. Some stock ids have preprocessor macros like #GTK_STOCK_OK
* and #GTK_STOCK_APPLY.
*
* If you want this menu item to have changeable accelerators, then pass in
* appropriate path for the menu item, use gtk_stock_lookup() to look up the
* standard accelerator for the stock item, and if one is found, call
* gtk_accel_map_add_entry() to register it.
- **/
+ *
+ * Returns: a new #GtkImageMenuItem.
+ */
GtkWidget*
-gtk_image_menu_item_new_from_stock (const gchar *stock_id,
- GtkAccelGroup *accel_group)
+gtk_image_menu_item_new_from_stock (const gchar *stock_id,
+ GtkAccelGroup *accel_group)
{
- return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
- "label", stock_id,
- "use-stock", TRUE,
- "accel-group", accel_group,
- NULL);
+ return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
+ "label", stock_id,
+ "use-stock", TRUE,
+ "accel-group", accel_group,
+ NULL);
}
/**
*/
void
gtk_image_menu_item_set_use_stock (GtkImageMenuItem *image_menu_item,
- gboolean use_stock)
+ gboolean use_stock)
{
GtkImageMenuItemPrivate *priv;
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;
}
/**
* @image_menu_item: a #GtkImageMenuItem
* @always_show: %TRUE if the menuitem should always show the image
*
- * If %TRUE, the menu item will ignore the #GtkSettings:gtk-menu-images
+ * If %TRUE, the menu item will ignore the #GtkSettings:gtk-menu-images
* setting and always show the image, if available.
*
* Use this property if the menuitem would be useless or hard to use
- * without the image.
- *
+ * without the image.
+ *
* Since: 2.16
*/
void
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
*
* Since: 2.16
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;
}
* Since: 2.16
*/
void
-gtk_image_menu_item_set_accel_group (GtkImageMenuItem *image_menu_item,
- GtkAccelGroup *accel_group)
+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 */
- if (!accel_group)
+ if (!accel_group)
return;
-
+
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_widget_add_accelerator (GTK_WIDGET (image_menu_item),
- "activate",
- accel_group,
- stock_item.keyval,
- stock_item.modifier,
- GTK_ACCEL_VISIBLE);
-
- g_object_notify (G_OBJECT (image_menu_item), "accel-group");
+ gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item),
+ "activate",
+ accel_group,
+ stock_item.keyval,
+ stock_item.modifier,
+ GTK_ACCEL_VISIBLE);
+
+ g_object_notify (G_OBJECT (image_menu_item), "accel-group");
}
}
-/**
+/**
* 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.
- **/
+ */
void
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_widget_set_parent (image, GTK_WIDGET (image_menu_item));
g_object_set (image,
- "visible", show_image (image_menu_item),
- "no-show-all", TRUE,
- NULL);
+ "visible", show_image (image_menu_item),
+ "no-show-all", TRUE,
+ NULL);
g_object_notify (G_OBJECT (image_menu_item), "image");
}
/**
* 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
+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);
}
}
static void
traverse_container (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
if (GTK_IS_IMAGE_MENU_ITEM (widget))
show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
list = gtk_window_list_toplevels ();
for (l = list; l; l = l->next)
- gtk_container_forall (GTK_CONTAINER (l->data),
- traverse_container, NULL);
+ gtk_container_forall (GTK_CONTAINER (l->data),
+ traverse_container, NULL);
- g_list_free (list);
+ g_list_free (list);
}
static void
gtk_image_menu_item_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen)
+ GdkScreen *previous_screen)
{
GtkSettings *settings;
- guint show_image_connection;
+ gulong show_image_connection;
if (!gtk_widget_has_screen (widget))
return;
settings = gtk_widget_get_settings (widget);
-
- show_image_connection =
- GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings),
- "gtk-image-menu-item-connection"));
-
+
+ show_image_connection =
+ g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0,
+ NULL, gtk_image_menu_item_setting_changed, NULL);
+
if (show_image_connection)
return;
- show_image_connection =
- g_signal_connect (settings, "notify::gtk-menu-images",
- G_CALLBACK (gtk_image_menu_item_setting_changed), NULL);
- g_object_set_data (G_OBJECT (settings),
- I_("gtk-image-menu-item-connection"),
- GUINT_TO_POINTER (show_image_connection));
+ g_signal_connect (settings, "notify::gtk-menu-images",
+ G_CALLBACK (gtk_image_menu_item_setting_changed), NULL);
show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
}
-
-#define __GTK_IMAGE_MENU_ITEM_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff