X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfixed.h;h=c7746bd9cea34eefe3197a3498f425b579e81fe4;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=fc65f6cae51dbef511b8f64ed79c70380d82ef9e;hpb=5f1b5d24067468fc86b28dccc504c71abdaf68b8;p=~andy%2Fgtk diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index fc65f6cae..c7746bd9c 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* @@ -24,14 +22,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - #ifndef __GTK_FIXED_H__ #define __GTK_FIXED_H__ +#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #include @@ -44,22 +42,28 @@ G_BEGIN_DECLS #define GTK_IS_FIXED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED)) #define GTK_FIXED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass)) -typedef struct _GtkFixed GtkFixed; -typedef struct _GtkFixedPriv GtkFixedPriv; -typedef struct _GtkFixedClass GtkFixedClass; -typedef struct _GtkFixedChild GtkFixedChild; +typedef struct _GtkFixed GtkFixed; +typedef struct _GtkFixedPrivate GtkFixedPrivate; +typedef struct _GtkFixedClass GtkFixedClass; +typedef struct _GtkFixedChild GtkFixedChild; struct _GtkFixed { GtkContainer container; - /* */ - GtkFixedPriv *priv; + /*< private >*/ + GtkFixedPrivate *priv; }; struct _GtkFixedClass { GtkContainerClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; struct _GtkFixedChild