* 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 <stdio.h>
-#include "gtkhscale.h"
-#include "gtksignal.h"
-#include "gtkintl.h"
+#include "config.h"
-static gpointer parent_class;
+#include <math.h>
+#include <stdlib.h>
-static void gtk_hscale_class_init (GtkHScaleClass *klass);
-static void gtk_hscale_init (GtkHScale *hscale);
-static gboolean gtk_hscale_expose (GtkWidget *widget,
- GdkEventExpose *event);
+#include "gtkhscale.h"
+#include "gtkorientable.h"
+#include "gtkalias.h"
-GtkType
-gtk_hscale_get_type (void)
-{
- static GtkType hscale_type = 0;
-
- if (!hscale_type)
- {
- static const GtkTypeInfo hscale_info =
- {
- "GtkHScale",
- sizeof (GtkHScale),
- sizeof (GtkHScaleClass),
- (GtkClassInitFunc) gtk_hscale_class_init,
- (GtkObjectInitFunc) gtk_hscale_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- hscale_type = gtk_type_unique (GTK_TYPE_SCALE, &hscale_info);
- }
-
- return hscale_type;
-}
+
+G_DEFINE_TYPE (GtkHScale, gtk_hscale, GTK_TYPE_SCALE)
static void
gtk_hscale_class_init (GtkHScaleClass *class)
{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
- GtkRangeClass *range_class;
-
- gobject_class = G_OBJECT_CLASS (class);
- widget_class = GTK_WIDGET_CLASS (class);
- range_class = GTK_RANGE_CLASS (class);
-
- parent_class = g_type_class_peek_parent (class);
+ GtkRangeClass *range_class = GTK_RANGE_CLASS (class);
range_class->slider_detail = "hscale";
-
- widget_class->expose_event = gtk_hscale_expose;
}
static void
gtk_hscale_init (GtkHScale *hscale)
{
- GtkRange *range;
-
- range = GTK_RANGE (hscale);
-
- range->orientation = GTK_ORIENTATION_HORIZONTAL;
- range->flippable = TRUE;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (hscale),
+ GTK_ORIENTATION_HORIZONTAL);
}
-GtkWidget*
+GtkWidget *
gtk_hscale_new (GtkAdjustment *adjustment)
{
- GtkWidget *hscale;
-
- hscale = gtk_widget_new (GTK_TYPE_HSCALE,
- "adjustment", adjustment,
- NULL);
+ g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment),
+ NULL);
- return hscale;
+ return g_object_new (GTK_TYPE_HSCALE,
+ "adjustment", adjustment,
+ NULL);
}
/**
* @min: minimum value
* @max: maximum value
* @step: step increment (tick size) used with keyboard shortcuts
- *
- * Creates a new horizontal scale widget that lets the user
- * input a number between @min and @max with the increment @step.
- * @step must be nonzero; it's the distance the slider moves when
- * using the arrow keys to adjust the scale value.
- *
+ *
+ * Creates a new horizontal scale widget that lets the user input a
+ * number between @min and @max (including @min and @max) with the
+ * increment @step. @step must be nonzero; it's the distance the
+ * slider moves when using the arrow keys to adjust the scale value.
+ *
+ * Note that the way in which the precision is derived works best if @step
+ * is a power of ten. If the resulting precision is not suitable for your
+ * needs, use gtk_scale_set_digits() to correct it.
+ *
* Return value: a new #GtkHScale
**/
-GtkWidget*
+GtkWidget *
gtk_hscale_new_with_range (gdouble min,
gdouble max,
gdouble step)
g_return_val_if_fail (min < max, NULL);
g_return_val_if_fail (step != 0.0, NULL);
- adj = gtk_adjustment_new (min, min, max, step, 10 * step, step);
-
+ adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
+
+ if (fabs (step) >= 1.0 || step == 0.0)
+ {
+ digits = 0;
+ }
+ else
+ {
+ digits = abs ((gint) floor (log10 (fabs (step))));
+ if (digits > 5)
+ digits = 5;
+ }
+
scale = g_object_new (GTK_TYPE_HSCALE,
"adjustment", adj,
+ "digits", digits,
NULL);
- if (fabs (step) >= 1.0 || step == 0.0)
- digits = 0;
- else {
- digits = abs ((gint) floor (log10 (fabs (step))));
- if (digits > 5)
- digits = 5;
- }
-
- gtk_scale_set_digits (scale, digits);
-
return GTK_WIDGET (scale);
}
-static gboolean
-gtk_hscale_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GtkRange *range;
- GtkHScale *hscale;
- GtkScale *scale;
-
- range = GTK_RANGE (widget);
- scale = GTK_SCALE (widget);
- hscale = GTK_HSCALE (widget);
-
- if (scale->draw_value)
- {
- PangoLayout *layout;
- PangoRectangle logical_rect;
- gchar *txt;
- gint x, y;
- GtkStateType state_type;
- gint value_spacing;
-
- gtk_widget_style_get (widget, "value_spacing", &value_spacing, NULL);
-
- txt = _gtk_scale_format_value (scale,
- GTK_RANGE (scale)->adjustment->value);
-
- layout = gtk_widget_create_pango_layout (widget, txt);
- g_free (txt);
-
- pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-
- switch (scale->value_pos)
- {
- case GTK_POS_LEFT:
- x = range->range_rect.x - value_spacing - logical_rect.width;
- y = range->range_rect.y + (range->range_rect.height - logical_rect.height) / 2;
- break;
-
- case GTK_POS_RIGHT:
- x = range->range_rect.x + range->range_rect.width + value_spacing;
- y = range->range_rect.y + (range->range_rect.height - logical_rect.height) / 2;
- break;
-
- case GTK_POS_TOP:
- x = range->slider_start +
- (range->slider_end - range->slider_start - logical_rect.width) / 2;
- x = CLAMP (x, 0, widget->allocation.width - logical_rect.width);
- y = range->range_rect.y - logical_rect.height - value_spacing;
- break;
-
- case GTK_POS_BOTTOM:
- x = range->slider_start +
- (range->slider_end - range->slider_start - logical_rect.width) / 2;
- x = CLAMP (x, 0, widget->allocation.width - logical_rect.width);
- y = range->range_rect.y + range->range_rect.height + value_spacing;
- break;
-
- default:
- g_return_val_if_reached (FALSE);
- x = 0;
- y = 0;
- break;
- }
-
- state_type = GTK_STATE_NORMAL;
- if (!GTK_WIDGET_IS_SENSITIVE (scale))
- state_type = GTK_STATE_INSENSITIVE;
-
- gtk_paint_layout (widget->style,
- widget->window,
- state_type,
- FALSE,
- NULL,
- widget,
- "hscale",
- x, y,
- layout);
-
- g_object_unref (G_OBJECT (layout));
- }
-
- return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
-}
+#define __GTK_HSCALE_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff