diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtkmisc.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtkmisc.c')
| -rw-r--r-- | gtk/gtkmisc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index fc711aade0..94d3052b61 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -31,7 +31,7 @@ #include "gtkprivate.h" -struct _GtkMiscPriv +struct _GtkMiscPrivate { gfloat xalign; gfloat yalign; @@ -115,17 +115,17 @@ gtk_misc_class_init (GtkMiscClass *class) 0, GTK_PARAM_READWRITE)); - g_type_class_add_private (class, sizeof (GtkMiscPriv)); + g_type_class_add_private (class, sizeof (GtkMiscPrivate)); } static void gtk_misc_init (GtkMisc *misc) { - GtkMiscPriv *priv; + GtkMiscPrivate *priv; misc->priv = G_TYPE_INSTANCE_GET_PRIVATE (misc, GTK_TYPE_MISC, - GtkMiscPriv); + GtkMiscPrivate); priv = misc->priv; priv->xalign = 0.5; @@ -141,7 +141,7 @@ gtk_misc_set_property (GObject *object, GParamSpec *pspec) { GtkMisc *misc = GTK_MISC (object); - GtkMiscPriv *priv = misc->priv; + GtkMiscPrivate *priv = misc->priv; switch (prop_id) { @@ -170,7 +170,7 @@ gtk_misc_get_property (GObject *object, GParamSpec *pspec) { GtkMisc *misc = GTK_MISC (object); - GtkMiscPriv *priv = misc->priv; + GtkMiscPrivate *priv = misc->priv; switch (prop_id) { @@ -197,7 +197,7 @@ gtk_misc_set_alignment (GtkMisc *misc, gfloat xalign, gfloat yalign) { - GtkMiscPriv *priv; + GtkMiscPrivate *priv; GtkWidget *widget; g_return_if_fail (GTK_IS_MISC (misc)); @@ -250,7 +250,7 @@ gtk_misc_get_alignment (GtkMisc *misc, gfloat *xalign, gfloat *yalign) { - GtkMiscPriv *priv; + GtkMiscPrivate *priv; g_return_if_fail (GTK_IS_MISC (misc)); @@ -267,7 +267,7 @@ gtk_misc_set_padding (GtkMisc *misc, gint xpad, gint ypad) { - GtkMiscPriv *priv; + GtkMiscPrivate *priv; GtkRequisition *requisition; g_return_if_fail (GTK_IS_MISC (misc)); @@ -319,7 +319,7 @@ gtk_misc_get_padding (GtkMisc *misc, gint *xpad, gint *ypad) { - GtkMiscPriv *priv; + GtkMiscPrivate *priv; g_return_if_fail (GTK_IS_MISC (misc)); |