Decrease code duplication in _remove_elt_from_level take two

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

diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c
index e401ec7e7c386d1113e22784f0fa258fbe6d322e..9fb5f92e77efb7594df67acdad6243b0cc6ac586 100644 (file)
--- a/gtk/gtkvseparator.c
+++ b/gtk/gtkvseparator.c
@@ -21,100 +21,54 @@
  * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#include <config.h>
-#include "gtkvseparator.h"
-#include "gtkintl.h"
-#include "gtkalias.h"
+#include "config.h"
 
+#include "gtkorientable.h"
+#undef GTK_DISABLE_DEPRECATED
+#include "gtkvseparator.h"
 
-static void gtk_vseparator_size_request (GtkWidget          *widget,
-                                         GtkRequisition     *requisition);
-static gint gtk_vseparator_expose       (GtkWidget          *widget,
-                                         GdkEventExpose     *event);
 
+/**
+ * SECTION:gtkvseparator
+ * @Short_description: A vertical separator
+ * @Title: GtkVSeparator
+ * @See_also: #GtkHSeparator
+ *
+ * The #GtkVSeparator widget is a vertical separator, used to group the
+ * widgets within a window. It displays a vertical line with a shadow to
+ * make it appear sunken into the interface.
+ *
+ * GtkVSeparator has been deprecated, use #GtkSeparator instead.
+ */
 
 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->size_request = gtk_vseparator_size_request;
-  widget_class->expose_event = gtk_vseparator_expose;
 }
 
 static void
 gtk_vseparator_init (GtkVSeparator *vseparator)
 {
-  GTK_WIDGET (vseparator)->requisition.width = GTK_WIDGET (vseparator)->style->xthickness;
-  GTK_WIDGET (vseparator)->requisition.height = 1;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (vseparator),
+                                  GTK_ORIENTATION_VERTICAL);
 }
 
-GtkWidget*
+/**
+ * gtk_vseparator_new:
+ *
+ * Creates a new #GtkVSeparator.
+ *
+ * Returns: a new #GtkVSeparator.
+ *
+ * Deprecated: 3.2: Use gtk_separator_new() with %GTK_ORIENTATION_VERTICAL instead
+ */
+GtkWidget *
 gtk_vseparator_new (void)
 {
   return g_object_new (GTK_TYPE_VSEPARATOR, NULL);
 }
-
-static void
-gtk_vseparator_size_request (GtkWidget      *widget,
-                             GtkRequisition *requisition)
-{
-  gboolean wide_separators;
-  gint     separator_width;
-
-  gtk_widget_style_get (widget,
-                        "wide-separators", &wide_separators,
-                        "separator-width", &separator_width,
-                        NULL);
-
-  if (wide_separators)
-    requisition->height = separator_width;
-  else
-    requisition->height = widget->style->xthickness;
-}
-
-static gint
-gtk_vseparator_expose (GtkWidget      *widget,
-                      GdkEventExpose *event)
-{
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      gboolean wide_separators;
-      gint     separator_width;
-
-      gtk_widget_style_get (widget,
-                            "wide-separators", &wide_separators,
-                            "separator-width", &separator_width,
-                            NULL);
-
-      if (wide_separators)
-        gtk_paint_box (widget->style, widget->window,
-                       GTK_WIDGET_STATE (widget), GTK_SHADOW_ETCHED_OUT,
-                       &event->area, widget, "vseparator",
-                       widget->allocation.x + (widget->allocation.width -
-                                               separator_width) / 2,
-                       widget->allocation.y,
-                       separator_width,
-                       widget->allocation.height);
-      else
-        gtk_paint_vline (widget->style, widget->window,
-                         GTK_WIDGET_STATE (widget),
-                         &event->area, widget, "vseparator",
-                         widget->allocation.y,
-                         widget->allocation.y + widget->allocation.height - 1,
-                         widget->allocation.x + (widget->allocation.width -
-                                                 widget->style->xthickness) / 2);
-    }
-
-  return FALSE;
-}
-
-#define __GTK_VSEPARATOR_C__
-#include "gtkaliasdef.c"