waf build works on OS X ; new bindings file and processing system in place for mnemon...

[ardour.git] / gtk2_ardour / gtk-custom-ruler.c

diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c
index 88234b72766955f6400b8c86953cbc58518ec074..4c937f861895632adb1f6843c96351d7255926bb 100644 (file)
--- a/gtk2_ardour/gtk-custom-ruler.c
+++ b/gtk2_ardour/gtk-custom-ruler.c
@@ -62,6 +62,11 @@ static void gtk_custom_ruler_get_property  (GObject        *object,
 static gint
 default_metric_get_marks (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
 {
+       (void) marks;
+       (void) lower;
+       (void) upper;
+       (void) maxchars;
+       
        return 0;
 }
 
@@ -89,6 +94,7 @@ GType gtk_custom_ruler_get_type (void)
                                sizeof (GtkCustomRuler),
                                0,              /* n_preallocs */
                                (GInstanceInitFunc) gtk_custom_ruler_init,
+                               NULL                    /* value_table */
                        };
                
                ruler_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCustomRuler",
@@ -192,6 +198,8 @@ gtk_custom_ruler_set_property (GObject      *object,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
+       (void) pspec;
+       
   GtkCustomRuler *ruler = GTK_CUSTOM_RULER (object);
 
   switch (prop_id)
@@ -334,25 +342,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