Fix typos

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

diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c
index 0894187dec19036adfb13facc28bf483b9f38522..f6ed5037a4cbf502c9648776058ce2fd1c729a9d 100644 (file)
--- a/gtk/gtkhscrollbar.c
+++ b/gtk/gtkhscrollbar.c
@@ -25,38 +25,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gtkhscrollbar.h"
-#include "gtksignal.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
-static void     gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);
-static void     gtk_hscrollbar_init             (GtkHScrollbar      *hscrollbar);
-
-GtkType
-gtk_hscrollbar_get_type (void)
-{
-  static GtkType hscrollbar_type = 0;
-  
-  if (!hscrollbar_type)
-    {
-      static const GtkTypeInfo hscrollbar_info =
-      {
-        "GtkHScrollbar",
-        sizeof (GtkHScrollbar),
-        sizeof (GtkHScrollbarClass),
-        (GtkClassInitFunc) gtk_hscrollbar_class_init,
-        (GtkObjectInitFunc) gtk_hscrollbar_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-      
-      hscrollbar_type = gtk_type_unique (GTK_TYPE_SCROLLBAR, &hscrollbar_info);
-    }
-  
-  return hscrollbar_type;
-}
+G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR)
 
 static void
 gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
@@ -79,10 +54,12 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment)
 {
   GtkWidget *hscrollbar;
   
-  hscrollbar = gtk_widget_new (GTK_TYPE_HSCROLLBAR,
-                              "adjustment", adjustment,
-                              NULL);
+  hscrollbar = g_object_new (GTK_TYPE_HSCROLLBAR,
+                            "adjustment", adjustment,
+                            NULL);
 
   return hscrollbar;
 }
 
+#define __GTK_HSCROLLBAR_C__
+#include "gtkaliasdef.c"