From 26d841e7b1fc94c4c7f19f34666dbefa6be5dc6b Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 28 Nov 2005 07:32:39 +0000 Subject: [PATCH] custom ruler fix, not sure if anything else is needed.... git-svn-id: svn://localhost/trunk/ardour2@135 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/gtk-custom-ruler.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c index 88234b7276..0e7ceb5875 100644 --- a/gtk2_ardour/gtk-custom-ruler.c +++ b/gtk2_ardour/gtk-custom-ruler.c @@ -334,25 +334,20 @@ gtk_custom_ruler_get_range (GtkCustomRuler *ruler, 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)); - klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT_CLASS (ruler)); - if (klass->draw_ticks) - klass->draw_ticks (ruler); + if (GTK_CUSTOM_RULER_GET_CLASS (ruler)->draw_ticks) + GTK_CUSTOM_RULER_GET_CLASS (ruler)->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