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/gtkspinbutton.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/gtkspinbutton.h')
-rw-r--r-- | gtk/gtkspinbutton.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index ba38984f26..2e431631cf 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -68,9 +68,9 @@ typedef enum } GtkSpinType; -typedef struct _GtkSpinButton GtkSpinButton; -typedef struct _GtkSpinButtonPriv GtkSpinButtonPriv; -typedef struct _GtkSpinButtonClass GtkSpinButtonClass; +typedef struct _GtkSpinButton GtkSpinButton; +typedef struct _GtkSpinButtonPrivate GtkSpinButtonPrivate; +typedef struct _GtkSpinButtonClass GtkSpinButtonClass; struct _GtkSpinButton @@ -78,7 +78,7 @@ struct _GtkSpinButton GtkEntry entry; /* <private> */ - GtkSpinButtonPriv *priv; + GtkSpinButtonPrivate *priv; }; struct _GtkSpinButtonClass |