Don't use *DISABLE_DEPRECATED guards

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

diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c
index 5f3a38c209d9f7f33e7000e3bdf44dc6ff30e6de..4dea4b6d256d37dbf87b2b86a4e66736d72c5a6c 100644 (file)
--- a/gtk/gtkhseparator.c
+++ b/gtk/gtkhseparator.c
@@ -2,89 +2,80 @@
  * 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
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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 "gtkhseparator.h"
 
+/*
+ * 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/.
+ */
 
-static void gtk_hseparator_class_init (GtkHSeparatorClass *klass);
-static void gtk_hseparator_init       (GtkHSeparator      *hseparator);
-static gint gtk_hseparator_expose     (GtkWidget          *widget,
-                                      GdkEventExpose     *event);
+#include "config.h"
 
+#include "gtkhseparator.h"
+#include "gtkorientable.h"
 
-guint
-gtk_hseparator_get_type ()
-{
-  static guint hseparator_type = 0;
 
-  if (!hseparator_type)
-    {
-      GtkTypeInfo hseparator_info =
-      {
-       "GtkHSeparator",
-       sizeof (GtkHSeparator),
-       sizeof (GtkHSeparatorClass),
-       (GtkClassInitFunc) gtk_hseparator_class_init,
-       (GtkObjectInitFunc) gtk_hseparator_init,
-       (GtkArgFunc) NULL,
-      };
+/**
+ * SECTION:gtkhseparator
+ * @Short_description: A horizontal separator
+ * @Title: GtkHSeparator
+ * @See_also: #GtkSeparator
+ *
+ * The #GtkHSeparator widget is a horizontal separator, used to group the
+ * widgets within a window. It displays a horizontal line with a shadow to
+ * make it appear sunken into the interface.
+ *
+ * <note>
+ * The #GtkHSeparator widget is not used as a separator within menus.
+ * To create a separator in a menu create an empty #GtkSeparatorMenuItem
+ * widget using gtk_separator_menu_item_new() and add it to the menu with
+ * gtk_menu_shell_append().
+ * </note>
+ *
+ * GtkHSeparator has been deprecated, use #GtkSeparator instead.
+ */
 
-      hseparator_type = gtk_type_unique (gtk_separator_get_type (), &hseparator_info);
-    }
 
-  return hseparator_type;
-}
+G_DEFINE_TYPE (GtkHSeparator, gtk_hseparator, GTK_TYPE_SEPARATOR)
 
 static void
 gtk_hseparator_class_init (GtkHSeparatorClass *class)
 {
-  GtkWidgetClass *widget_class;
-
-  widget_class = (GtkWidgetClass*) class;
-
-  widget_class->expose_event = gtk_hseparator_expose;
 }
 
 static void
 gtk_hseparator_init (GtkHSeparator *hseparator)
 {
-  GTK_WIDGET (hseparator)->requisition.width = 1;
-  GTK_WIDGET (hseparator)->requisition.height = GTK_WIDGET (hseparator)->style->klass->ythickness;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (hseparator),
+                                  GTK_ORIENTATION_HORIZONTAL);
 }
 
-GtkWidget*
-gtk_hseparator_new ()
-{
-  return GTK_WIDGET (gtk_type_new (gtk_hseparator_get_type ()));
-}
-
-
-static gint
-gtk_hseparator_expose (GtkWidget      *widget,
-                      GdkEventExpose *event)
+/**
+ * gtk_hseparator_new:
+ *
+ * Creates a new #GtkHSeparator.
+ *
+ * Returns: a new #GtkHSeparator.
+ *
+ * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_HORIZONTAL instead
+ */
+GtkWidget *
+gtk_hseparator_new (void)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_HSEPARATOR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    gtk_draw_hline (widget->style, widget->window, GTK_STATE_NORMAL,
-                   widget->allocation.x,
-                   widget->allocation.x + widget->allocation.width,
-                   widget->allocation.y + (widget->allocation.height -
-                                           widget->style->klass->ythickness) / 2);
-
-  return FALSE;
+  return g_object_new (GTK_TYPE_HSEPARATOR, NULL);
 }