Practically everything changed.

[~andy/gtk] / gtk / gtkalignment.c

diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 25aa56f387f95e3358cc96e395ede8ecd90e97dd..018e67d255ae835178d68ce06d1a7a652bb1b817 100644 (file)
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtkalignment.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
@@ -41,9 +41,7 @@ enum {
   PROP_TOP_PADDING,
   PROP_BOTTOM_PADDING,
   PROP_LEFT_PADDING,
-  PROP_RIGHT_PADDING,
-  
-  PROP_LAST
+  PROP_RIGHT_PADDING
 };
 
 #define GTK_ALIGNMENT_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
@@ -56,8 +54,6 @@ struct _GtkAlignmentPrivate
   guint padding_right;
 };
 
-static void gtk_alignment_class_init    (GtkAlignmentClass *klass);
-static void gtk_alignment_init          (GtkAlignment      *alignment);
 static void gtk_alignment_size_request  (GtkWidget         *widget,
                                         GtkRequisition    *requisition);
 static void gtk_alignment_size_allocate (GtkWidget         *widget,
@@ -71,32 +67,7 @@ static void gtk_alignment_get_property (GObject         *object,
                                         GValue          *value,
                                         GParamSpec      *pspec);
 
-GType
-gtk_alignment_get_type (void)
-{
-  static GType alignment_type = 0;
-
-  if (!alignment_type)
-    {
-      static const GTypeInfo alignment_info =
-      {
-       sizeof (GtkAlignmentClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_alignment_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkAlignment),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_alignment_init,
-      };
-
-      alignment_type = g_type_register_static (GTK_TYPE_BIN, "GtkAlignment",
-                                              &alignment_info, 0);
-    }
-
-  return alignment_type;
-}
+G_DEFINE_TYPE (GtkAlignment, gtk_alignment, GTK_TYPE_BIN)
 
 static void
 gtk_alignment_class_init (GtkAlignmentClass *class)
@@ -441,11 +412,9 @@ static void
 gtk_alignment_size_request (GtkWidget      *widget,
                            GtkRequisition *requisition)
 {
-  GtkAlignment *alignment;
   GtkBin *bin;
   GtkAlignmentPrivate *priv;
 
-  alignment = GTK_ALIGNMENT (widget);
   bin = GTK_BIN (widget);
   priv = GTK_ALIGNMENT_GET_PRIVATE (widget);