fix recent files issues

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

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index 1379b396949e22dc5c9eee15acfd0b270d93f4e0..591091dc6545980f839b6ddd39853cbc1025bef9 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -28,6 +28,8 @@
 #include "gtkcontainer.h"
 #include "gtkmisc.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -38,8 +40,6 @@ enum {
   PROP_YPAD
 };
 
-static void gtk_misc_class_init   (GtkMiscClass *klass);
-static void gtk_misc_init         (GtkMisc      *misc);
 static void gtk_misc_realize      (GtkWidget    *widget);
 static void gtk_misc_set_property (GObject         *object,
                                   guint            prop_id,
@@ -51,33 +51,7 @@ static void gtk_misc_get_property (GObject         *object,
                                   GParamSpec      *pspec);
 
 
-GType
-gtk_misc_get_type (void)
-{
-  static GType misc_type = 0;
-
-  if (!misc_type)
-    {
-      static const GTypeInfo misc_info =
-      {
-       sizeof (GtkMiscClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_misc_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkMisc),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_misc_init,
-       NULL,           /* value_table */
-      };
-
-      misc_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkMisc",
-                                         &misc_info, G_TYPE_FLAG_ABSTRACT);
-    }
-
-  return misc_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET)
 
 static void
 gtk_misc_class_init (GtkMiscClass *class)
@@ -97,11 +71,11 @@ gtk_misc_class_init (GtkMiscClass *class)
                                    PROP_XALIGN,
                                    g_param_spec_float ("xalign",
                                                       P_("X align"),
-                                                      P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts"),
+                                                      P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."),
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YALIGN,
@@ -111,7 +85,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_XPAD,
@@ -121,7 +95,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YPAD,
@@ -131,7 +105,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 }
 
 static void
@@ -330,14 +304,12 @@ gtk_misc_get_padding (GtkMisc *misc,
 static void
 gtk_misc_realize (GtkWidget *widget)
 {
-  GtkMisc *misc;
   GdkWindowAttr attributes;
   gint attributes_mask;
 
   g_return_if_fail (GTK_IS_MISC (widget));
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  misc = GTK_MISC (widget);
 
   if (GTK_WIDGET_NO_WINDOW (widget))
     {
@@ -365,3 +337,6 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"