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/gtkalignment.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/gtkalignment.h')
| -rw-r--r-- | gtk/gtkalignment.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index 9b391efda4..498ad93c45 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -45,16 +45,16 @@ G_BEGIN_DECLS #define GTK_ALIGNMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass)) -typedef struct _GtkAlignment GtkAlignment; -typedef struct _GtkAlignmentPriv GtkAlignmentPriv; -typedef struct _GtkAlignmentClass GtkAlignmentClass; +typedef struct _GtkAlignment GtkAlignment; +typedef struct _GtkAlignmentPrivate GtkAlignmentPrivate; +typedef struct _GtkAlignmentClass GtkAlignmentClass; struct _GtkAlignment { GtkBin bin; /* <private> */ - GtkAlignmentPriv *priv; + GtkAlignmentPrivate *priv; }; struct _GtkAlignmentClass |