Seal priv pointer in GtkComboBox.

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

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 1aa6231ac04d69f8cd704826ce4225bd03ca3df1..b87519ca7052622b2626bc6266d17dea18544739 100644 (file)
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -2,59 +2,35 @@
  * 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
+ * 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.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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/. 
  */
 
+#include <config.h>
 #include "gtkseparator.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 
-static void gtk_separator_class_init (GtkSeparatorClass *klass);
-static void gtk_separator_init       (GtkSeparator      *separator);
-
-
-GtkType
-gtk_separator_get_type (void)
-{
-  static GtkType separator_type = 0;
-
-  if (!separator_type)
-    {
-      static const GtkTypeInfo separator_info =
-      {
-       "GtkSeparator",
-       sizeof (GtkSeparator),
-       sizeof (GtkSeparatorClass),
-       (GtkClassInitFunc) gtk_separator_class_init,
-       (GtkObjectInitFunc) gtk_separator_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      separator_type = gtk_type_unique (GTK_TYPE_WIDGET, &separator_info);
-    }
-
-  return separator_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET)
 
 static void
 gtk_separator_class_init (GtkSeparatorClass *class)
@@ -66,3 +42,6 @@ gtk_separator_init (GtkSeparator *separator)
 {
   GTK_WIDGET_SET_FLAGS (separator, GTK_NO_WINDOW);
 }
+
+#define __GTK_SEPARATOR_C__
+#include "gtkaliasdef.c"