Update Norwegian bokmål translation.

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

diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index 7a525663115c052b801640b1d3374d86b8888d09..855c1688cef8cb65f14393c42d87131b2bfa9f6e 100644 (file)
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -2,91 +2,53 @@
  * 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.
  */
-#include "gtkvseparator.h"
-
-
-static void gtk_vseparator_class_init (GtkVSeparatorClass *klass);
-static void gtk_vseparator_init       (GtkVSeparator      *vseparator);
-static gint gtk_vseparator_expose     (GtkWidget          *widget,
-                                      GdkEventExpose     *event);
-
 
-guint
-gtk_vseparator_get_type ()
-{
-  static guint vseparator_type = 0;
+/*
+ * 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/.
+ */
 
-  if (!vseparator_type)
-    {
-      GtkTypeInfo vseparator_info =
-      {
-       "GtkVSeparator",
-       sizeof (GtkVSeparator),
-       sizeof (GtkVSeparatorClass),
-       (GtkClassInitFunc) gtk_vseparator_class_init,
-       (GtkObjectInitFunc) gtk_vseparator_init,
-       (GtkArgSetFunc) NULL,
-        (GtkArgGetFunc) NULL,
-      };
+#include "config.h"
 
-      vseparator_type = gtk_type_unique (gtk_separator_get_type (), &vseparator_info);
-    }
+#include "gtkorientable.h"
+#include "gtkvseparator.h"
+#include "gtkalias.h"
 
-  return vseparator_type;
-}
+G_DEFINE_TYPE (GtkVSeparator, gtk_vseparator, GTK_TYPE_SEPARATOR)
 
 static void
 gtk_vseparator_class_init (GtkVSeparatorClass *klass)
 {
-  GtkWidgetClass *widget_class;
-
-  widget_class = (GtkWidgetClass*) klass;
-
-  widget_class->expose_event = gtk_vseparator_expose;
 }
 
 static void
 gtk_vseparator_init (GtkVSeparator *vseparator)
 {
-  GTK_WIDGET (vseparator)->requisition.width = GTK_WIDGET (vseparator)->style->klass->xthickness;
-  GTK_WIDGET (vseparator)->requisition.height = 1;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (vseparator),
+                                  GTK_ORIENTATION_VERTICAL);
 }
 
-GtkWidget*
-gtk_vseparator_new ()
+GtkWidget *
+gtk_vseparator_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_vseparator_get_type ()));
+  return g_object_new (GTK_TYPE_VSEPARATOR, NULL);
 }
 
-
-static gint
-gtk_vseparator_expose (GtkWidget      *widget,
-                      GdkEventExpose *event)
-{
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_VSEPARATOR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_draw_vline (widget->style, widget->window, GTK_STATE_NORMAL,
-                   widget->allocation.y,
-                   widget->allocation.y + widget->allocation.height,
-                   widget->allocation.x + (widget->allocation.width -
-                                           widget->style->klass->xthickness) / 2);
-
-  return FALSE;
-}
+#define __GTK_VSEPARATOR_C__
+#include "gtkaliasdef.c"