X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgtk-custom-ruler.c;h=797922f5639b3296bba965a7f6133ac72b767fc3;hb=05ae84cbed64e6bb0c77e8fcdb933d826f0ac277;hp=0e7ceb5875b3dc360874eea9831bee75e4058e9b;hpb=26d841e7b1fc94c4c7f19f34666dbefa6be5dc6b;p=ardour.git

diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c
index 0e7ceb5875..797922f563 100644
--- a/gtk2_ardour/gtk-custom-ruler.c
+++ b/gtk2_ardour/gtk-custom-ruler.c
@@ -21,7 +21,7 @@
  * 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> */
@@ -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;
 }
 
@@ -75,7 +80,7 @@ static GtkWidgetClass *parent_class;
 GType gtk_custom_ruler_get_type (void)
 {
 	static GType ruler_type = 0;
-	
+
 	if (!ruler_type)
 	{
 		static const GTypeInfo ruler_info =
@@ -89,12 +94,13 @@ 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",
 					   &ruler_info, 0);
 	}
-	
+
 	return ruler_type;
 }
 
@@ -103,15 +109,15 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 {
 	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;
@@ -128,8 +134,8 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 							      -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",
@@ -138,8 +144,8 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 							      -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",
@@ -148,8 +154,8 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 							      -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",
@@ -158,7 +164,7 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 							      -G_MAXDOUBLE,
 							      G_MAXDOUBLE,
 							      0.0,
-							      G_PARAM_READWRITE));  
+							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class,
 					 PROP_SHOW_POSITION,
@@ -166,7 +172,7 @@ gtk_custom_ruler_class_init (GtkCustomRulerClass * class)
 							       _("Show Position"),
 							       _("Draw current ruler position"),
 							       TRUE,
-							       G_PARAM_READWRITE));  
+							       G_PARAM_READWRITE));
 }
 
 static void
@@ -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)
@@ -225,7 +233,7 @@ gtk_custom_ruler_get_property (GObject      *object,
 			       GParamSpec   *pspec)
 {
   GtkCustomRuler *ruler = GTK_CUSTOM_RULER (object);
-  
+
   switch (prop_id)
     {
     case PROP_LOWER:
@@ -338,14 +346,14 @@ gtk_custom_ruler_draw_ticks (GtkCustomRuler * 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)
 {
         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);
 }
@@ -434,10 +442,10 @@ gtk_custom_ruler_expose (GtkWidget * widget, GdkEventExpose * event)
 
 		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);
 	}