X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkalignment.h;h=50a5dc4f867a7bc5dd0650d516e2a572dc6ec82d;hb=1074aa0c49f647ed4b2a969618051c59da5aad01;hp=d8338058467e8bcd3530f27cab6dca9649522274;hpb=92006c8e78e9c41656cb7a95ec290882faffaaae;p=~andy%2Fgtk

diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index d83380584..50a5dc4f8 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -2,58 +2,72 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #ifndef __GTK_ALIGNMENT_H__
 #define __GTK_ALIGNMENT_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#include <gtk/gtkbin.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
-#define GTK_ALIGNMENT(obj)          GTK_CHECK_CAST (obj, gtk_alignment_get_type (), GtkAlignment)
-#define GTK_ALIGNMENT_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_alignment_get_type (), GtkAlignmentClass)
-#define GTK_IS_ALIGNMENT(obj)       GTK_CHECK_TYPE (obj, gtk_alignment_get_type ())
+#define GTK_TYPE_ALIGNMENT                  (gtk_alignment_get_type ())
+#define GTK_ALIGNMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment))
+#define GTK_ALIGNMENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
+#define GTK_IS_ALIGNMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT))
+#define GTK_IS_ALIGNMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
+#define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
 
 
-typedef struct _GtkAlignment       GtkAlignment;
-typedef struct _GtkAlignmentClass  GtkAlignmentClass;
+typedef struct _GtkAlignment              GtkAlignment;
+typedef struct _GtkAlignmentPrivate       GtkAlignmentPrivate;
+typedef struct _GtkAlignmentClass         GtkAlignmentClass;
 
 struct _GtkAlignment
 {
   GtkBin bin;
 
-  gfloat xalign;
-  gfloat yalign;
-  gfloat xscale;
-  gfloat yscale;
+  /*< private >*/
+  GtkAlignmentPrivate *priv;
 };
 
 struct _GtkAlignmentClass
 {
   GtkBinClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-guint      gtk_alignment_get_type   (void);
+GType      gtk_alignment_get_type   (void) G_GNUC_CONST;
 GtkWidget* gtk_alignment_new        (gfloat             xalign,
 				     gfloat             yalign,
 				     gfloat             xscale,
@@ -64,10 +78,19 @@ void       gtk_alignment_set        (GtkAlignment      *alignment,
 				     gfloat             xscale,
 				     gfloat             yscale);
 
+void       gtk_alignment_set_padding (GtkAlignment      *alignment,
+				      guint              padding_top,
+				      guint              padding_bottom,
+				      guint              padding_left,
+				      guint              padding_right);
+
+void       gtk_alignment_get_padding (GtkAlignment      *alignment,
+				      guint             *padding_top,
+				      guint             *padding_bottom,
+				      guint             *padding_left,
+				      guint             *padding_right);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_ALIGNMENT_H__ */