* 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 "gtkalias.h"
-#include "gtkhseparator.h"
-
-
-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"
-GType
-gtk_hseparator_get_type (void)
-{
- static GType hseparator_type = 0;
-
- if (!hseparator_type)
- {
- static const GTypeInfo hseparator_info =
- {
- sizeof (GtkHSeparatorClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_hseparator_class_init,
- NULL, /* class_finalize */
- NULL, /* class_init */
- sizeof (GtkHSeparator),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_hseparator_init,
- };
-
- hseparator_type =
- g_type_register_static (GTK_TYPE_SEPARATOR, "GtkHSeparator",
- &hseparator_info, 0);
- }
+#include "gtkhseparator.h"
+#include "gtkorientable.h"
+#include "gtkalias.h"
- 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->ythickness;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (hseparator),
+ GTK_ORIENTATION_HORIZONTAL);
}
-GtkWidget*
+GtkWidget *
gtk_hseparator_new (void)
{
return g_object_new (GTK_TYPE_HSEPARATOR, NULL);
}
-
-static gint
-gtk_hseparator_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- if (GTK_WIDGET_DRAWABLE (widget))
- gtk_paint_hline (widget->style, widget->window, GTK_WIDGET_STATE (widget),
- &event->area, widget, "hseparator",
- widget->allocation.x,
- widget->allocation.x + widget->allocation.width - 1,
- widget->allocation.y + (widget->allocation.height -
- widget->style->ythickness) / 2);
-
- return FALSE;
-}
+#define __GTK_HSEPARATOR_C__
+#include "gtkaliasdef.c"