* Modified by the GTK+ Team and others 1997-1999. 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/.
*/
/* modified by andreas meyer <hexx3000@gmx.de> */
static gint
default_metric_get_marks (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
+ (void) marks;
+ (void) lower;
+ (void) upper;
+ (void) maxchars;
+
return 0;
}
GType gtk_custom_ruler_get_type (void)
{
static GType ruler_type = 0;
-
+
if (!ruler_type)
{
static const GTypeInfo ruler_info =
sizeof (GtkCustomRuler),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_custom_ruler_init,
+ NULL /* value_table */
};
-
+
ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomRuler",
&ruler_info, 0);
}
-
+
return ruler_type;
}
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
-
+
gobject_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass*) class;
-
+
parent_class = g_type_class_peek_parent (class);
-
+
gobject_class->set_property = gtk_custom_ruler_set_property;
gobject_class->get_property = gtk_custom_ruler_get_property;
-
+
widget_class->realize = gtk_custom_ruler_realize;
widget_class->unrealize = gtk_custom_ruler_unrealize;
widget_class->size_allocate = gtk_custom_ruler_size_allocate;
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
- G_PARAM_READWRITE));
-
+ G_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
PROP_UPPER,
g_param_spec_double ("upper",
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
- G_PARAM_READWRITE));
-
+ G_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
PROP_POSITION,
g_param_spec_double ("position",
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
- G_PARAM_READWRITE));
-
+ G_PARAM_READWRITE));
+
g_object_class_install_property (gobject_class,
PROP_MAX_SIZE,
g_param_spec_double ("max_size",
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHOW_POSITION,
_("Show Position"),
_("Draw current ruler position"),
TRUE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE));
}
static void
const GValue *value,
GParamSpec *pspec)
{
+ (void) pspec;
+
GtkCustomRuler *ruler = GTK_CUSTOM_RULER (object);
switch (prop_id)
GParamSpec *pspec)
{
GtkCustomRuler *ruler = GTK_CUSTOM_RULER (object);
-
+
switch (prop_id)
{
case PROP_LOWER:
void
gtk_custom_ruler_draw_ticks (GtkCustomRuler * ruler)
{
- GtkCustomRulerClass *klass;
- g_return_if_fail (ruler != NULL);
- g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler));
+ g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler));
+
+ if (GTK_CUSTOM_RULER_GET_CLASS (ruler)->draw_ticks)
+ GTK_CUSTOM_RULER_GET_CLASS (ruler)->draw_ticks (ruler);
- klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT_CLASS (ruler));
- if (klass->draw_ticks)
- klass->draw_ticks (ruler);
}
void
gtk_custom_ruler_draw_pos (GtkCustomRuler * ruler)
{
- GtkCustomRulerClass *klass;
- g_return_if_fail (ruler != NULL);
- g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler));
-
- klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT_CLASS (ruler));
- if (klass->draw_pos && ruler->show_position)
- klass->draw_pos (ruler);
+ g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler));
+
+ if (GTK_CUSTOM_RULER_GET_CLASS (ruler)->draw_pos && ruler->show_position)
+ GTK_CUSTOM_RULER_GET_CLASS (ruler)->draw_pos (ruler);
}
static void
gtk_custom_ruler_draw_ticks (ruler);
- gdk_draw_pixmap (widget->window,
- ruler->non_gr_exp_gc,
- ruler->backing_store, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
-
+ gdk_draw_drawable (widget->window,
+ ruler->non_gr_exp_gc,
+ GDK_DRAWABLE(ruler->backing_store), 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
+
gtk_custom_ruler_draw_pos (ruler);
}