Merge branch 'master' into toolpalette

[~andy/gtk] / gtk / gtkruler.h

diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index 2ef0784903c1348a31c55690abbd6397e7668ed4..ed149e3af6057f1589e7c7e94cc34667cadb36ec 100644 (file)
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -42,7 +42,6 @@
 #define __GTK_RULER_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
 
@@ -110,23 +109,23 @@ struct _GtkRulerMetric
 };
 
 
-GType   gtk_ruler_get_type   (void) G_GNUC_CONST;
-void    gtk_ruler_set_metric (GtkRuler      *ruler,
-                             GtkMetricType  metric);
-void    gtk_ruler_set_range  (GtkRuler      *ruler,
-                             gdouble        lower,
-                             gdouble        upper,
-                             gdouble        position,
-                             gdouble        max_size);
-void    gtk_ruler_draw_ticks (GtkRuler      *ruler);
-void    gtk_ruler_draw_pos   (GtkRuler      *ruler);
-
-GtkMetricType gtk_ruler_get_metric (GtkRuler *ruler);
-void          gtk_ruler_get_range  (GtkRuler *ruler,
-                                   gdouble  *lower,
-                                   gdouble  *upper,
-                                   gdouble  *position,
-                                   gdouble  *max_size);
+GType           gtk_ruler_get_type   (void) G_GNUC_CONST;
+void            gtk_ruler_set_metric (GtkRuler       *ruler,
+                                      GtkMetricType   metric);
+GtkMetricType   gtk_ruler_get_metric (GtkRuler       *ruler);
+void            gtk_ruler_set_range  (GtkRuler       *ruler,
+                                      gdouble         lower,
+                                      gdouble         upper,
+                                      gdouble         position,
+                                      gdouble         max_size);
+void            gtk_ruler_get_range  (GtkRuler       *ruler,
+                                      gdouble        *lower,
+                                      gdouble        *upper,
+                                      gdouble        *position,
+                                      gdouble        *max_size);
+
+void            gtk_ruler_draw_ticks (GtkRuler       *ruler);
+void            gtk_ruler_draw_pos   (GtkRuler       *ruler);
 
 G_END_DECLS