summaryrefslogtreecommitdiff
path: root/gtk/gtkimagemenuitem.c
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-08-26 19:15:37 +0200
committerJavier Jardón <jjardon@gnome.org>2010-08-27 04:48:23 +0200
commit1e5d7c022596b7146638ef8bd74f544725f9bf2b (patch)
tree61505bd6664441c672463e0d3c085aa199a8dbd8 /gtk/gtkimagemenuitem.c
parentc6a44d849424ac77c478d56ff727ebc742d054b0 (diff)
downloadgtk+-1e5d7c022596b7146638ef8bd74f544725f9bf2b.tar.gz
Use GtkFooPrivate instead GtkFooPriv
Diffstat (limited to 'gtk/gtkimagemenuitem.c')
-rw-r--r--gtk/gtkimagemenuitem.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 6965d4dabd..8c5a63afa3 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -39,7 +39,7 @@
-struct _GtkImageMenuItemPriv
+struct _GtkImageMenuItemPrivate
{
GtkWidget *image;
@@ -194,17 +194,17 @@ gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass)
TRUE,
GTK_PARAM_READWRITE));
- g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPriv));
+ g_type_class_add_private (object_class, sizeof (GtkImageMenuItemPrivate));
}
static void
gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPriv *priv;
+ GtkImageMenuItemPrivate *priv;
image_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_menu_item,
GTK_TYPE_IMAGE_MENU_ITEM,
- GtkImageMenuItemPriv);
+ GtkImageMenuItemPrivate);
priv = image_menu_item->priv;
priv->image = NULL;
@@ -215,7 +215,7 @@ gtk_image_menu_item_init (GtkImageMenuItem *image_menu_item)
static void
gtk_image_menu_item_finalize (GObject *object)
{
- GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (object)->priv;
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (object)->priv;
g_free (priv->label);
priv->label = NULL;
@@ -279,7 +279,7 @@ gtk_image_menu_item_get_property (GObject *object,
static gboolean
show_image (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (image_menu_item));
gboolean show;
@@ -295,7 +295,7 @@ static void
gtk_image_menu_item_map (GtkWidget *widget)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->map (widget);
@@ -309,7 +309,7 @@ static void
gtk_image_menu_item_destroy (GtkObject *object)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (object);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
if (priv->image)
gtk_container_remove (GTK_CONTAINER (image_menu_item),
@@ -323,7 +323,7 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (menu_item);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkPackDirection pack_dir;
GtkWidget *parent;
GtkWidget *widget = GTK_WIDGET (menu_item);
@@ -364,7 +364,7 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
static void
gtk_image_menu_item_recalculate (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkStockItem stock_item;
GtkWidget *image;
const gchar *resolved_label = priv->label;
@@ -393,7 +393,7 @@ static void
gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
const gchar *label)
{
- GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
if (priv->label != label)
{
@@ -410,7 +410,7 @@ gtk_image_menu_item_set_label (GtkMenuItem *menu_item,
static G_CONST_RETURN gchar *
gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
{
- GtkImageMenuItemPriv *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
+ GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
return priv->label;
}
@@ -420,7 +420,7 @@ gtk_image_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
gint child_width = 0;
gint child_height = 0;
GtkPackDirection pack_dir;
@@ -466,7 +466,7 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GtkAllocation widget_allocation;
GtkPackDirection pack_dir;
GtkWidget *parent;
@@ -555,7 +555,7 @@ gtk_image_menu_item_forall (GtkContainer *container,
gpointer callback_data)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
GTK_CONTAINER_CLASS (gtk_image_menu_item_parent_class)->forall (container,
include_internals,
@@ -784,7 +784,7 @@ void
gtk_image_menu_item_set_use_stock (GtkImageMenuItem *image_menu_item,
gboolean use_stock)
{
- GtkImageMenuItemPriv *priv;
+ GtkImageMenuItemPrivate *priv;
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
@@ -837,7 +837,7 @@ void
gtk_image_menu_item_set_always_show_image (GtkImageMenuItem *image_menu_item,
gboolean always_show)
{
- GtkImageMenuItemPriv *priv;
+ GtkImageMenuItemPrivate *priv;
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
@@ -898,7 +898,7 @@ void
gtk_image_menu_item_set_accel_group (GtkImageMenuItem *image_menu_item,
GtkAccelGroup *accel_group)
{
- GtkImageMenuItemPriv *priv;
+ GtkImageMenuItemPrivate *priv;
GtkStockItem stock_item;
/* Silent return for the constructor */
@@ -937,7 +937,7 @@ void
gtk_image_menu_item_set_image (GtkImageMenuItem *image_menu_item,
GtkWidget *image)
{
- GtkImageMenuItemPriv *priv;
+ GtkImageMenuItemPrivate *priv;
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (image_menu_item));
@@ -985,7 +985,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
GtkWidget *child)
{
GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (container);
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
if (child == priv->image)
{
@@ -1011,7 +1011,7 @@ gtk_image_menu_item_remove (GtkContainer *container,
static void
show_image_change_notify (GtkImageMenuItem *image_menu_item)
{
- GtkImageMenuItemPriv *priv = image_menu_item->priv;
+ GtkImageMenuItemPrivate *priv = image_menu_item->priv;
if (priv->image)
{