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/gtkcontainer.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/gtkcontainer.h')
| -rw-r--r-- | gtk/gtkcontainer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index e37de1ee38..ff84ac8ff0 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -46,16 +46,16 @@ G_BEGIN_DECLS #define GTK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass)) -typedef struct _GtkContainer GtkContainer; -typedef struct _GtkContainerPriv GtkContainerPriv; -typedef struct _GtkContainerClass GtkContainerClass; +typedef struct _GtkContainer GtkContainer; +typedef struct _GtkContainerPrivate GtkContainerPrivate; +typedef struct _GtkContainerClass GtkContainerClass; struct _GtkContainer { GtkWidget widget; /*< private >*/ - GtkContainerPriv *priv; + GtkContainerPrivate *priv; }; struct _GtkContainerClass |