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/gtkimage.h | |
| 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/gtkimage.h')
| -rw-r--r-- | gtk/gtkimage.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 0a02219cc0..9085fcb25e 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -46,9 +46,9 @@ G_BEGIN_DECLS #define GTK_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass)) -typedef struct _GtkImage GtkImage; -typedef struct _GtkImagePriv GtkImagePriv; -typedef struct _GtkImageClass GtkImageClass; +typedef struct _GtkImage GtkImage; +typedef struct _GtkImagePrivate GtkImagePrivate; +typedef struct _GtkImageClass GtkImageClass; typedef struct _GtkImagePixmapData GtkImagePixmapData; typedef struct _GtkImageImageData GtkImageImageData; @@ -145,7 +145,7 @@ struct _GtkImage GtkMisc misc; /* <private> */ - GtkImagePriv *priv; + GtkImagePrivate *priv; }; struct _GtkImageClass |