make this special-case hscale/vscale details, so we can use it for

2001-06-03  Havoc Pennington  <hp@pobox.com>

	* gtk/gtkstyle.c (gtk_default_draw_slider): make this special-case
	hscale/vscale details, so we can use it for scrollbar as well.

	* tests/testgtk.c (reformat_value): honor digits from GtkScale

	* gtk/gtkenums.h (GtkTroughType): Remove this enum
	(GtkScrollType): add START and END from GtkTroughType

	* gtk/gtkstyle.c (gtk_default_draw_slider): was not properly using
	its x/y arguments

	* gtk/gtkrange.h, gtk/gtkrange.c, gtk/gtkscrollbar.h,
	gtk/gtkscrollbar.c, gtk/gtkscale.h, gtk/gtkscale.c,
	gtk/gtkhscrollbar.h, gtk/gtkhscrollbar.c, gtk/gtkvscrollbar.h,
	gtk/gtkvscrollbar.c, gtk/gtkhscale.h, gtk/gtkhscale.c,
	gtk/gtkvscale.h, gtk/gtkvscale.c: Rewrite GtkRange and subclasses.

	Notable changes in the process:

	- stepper_size style property is the height for vertical
	  ranges, width for horizontal; the other dimension matches
	  the trough size
	- add ability to do NeXT-style steppers (and several other styles
	  that don't make any sense)
	- added min_slider_length, fixed_slider_length properties to
          GtkScrollbar
        - cleaned some private (or at least useless) functions out of
          gtkscale.h
        - moved bindings to GtkScale from subclasses, even arrow keys,
	  since blind users don't know scale orientation.
        - change move_slider action signal to use new GtkScrollType,
	  remove GtkTroughType argument
	- digits rounds the values a range will input to the given
	  number of decimals, but will not try to force adjustment
	  values set by other controllers. That is, we no longer
	  modify adjustment->value inside a value_changed handler.
	- added getters for GtkScale setters
        - middle-click begins a slider drag

1 files changed, 15 insertions, 14 deletions

diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index b6cd719547..bfb099ef1b 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -52,6 +52,7 @@ struct _GtkScale
 {
   GtkRange range;
 
+  gint digits;
   guint draw_value : 1;
   guint value_pos : 2;
 };
@@ -60,8 +61,6 @@ struct _GtkScaleClass
 {
   GtkRangeClass parent_class;
 
-  gint value_spacing;
-
   gchar* (* format_value) (GtkRange *range,
                            gdouble   value);  
   
@@ -69,19 +68,21 @@ struct _GtkScaleClass
 };
 
 GtkType gtk_scale_get_type        (void) G_GNUC_CONST;
-void    gtk_scale_set_digits      (GtkScale        *scale,
-				   gint             digits);
-void    gtk_scale_set_draw_value  (GtkScale        *scale,
-				   gboolean         draw_value);
-void    gtk_scale_set_value_pos   (GtkScale        *scale,
-				   GtkPositionType  pos);
-gint    gtk_scale_get_value_width (GtkScale        *scale);
-void    gtk_scale_get_value_size  (GtkScale        *scale,
-				   gint            *width,
-				   gint            *height);
-
-void    gtk_scale_draw_value      (GtkScale        *scale);
 
+void            gtk_scale_set_digits     (GtkScale        *scale,
+                                          gint             digits);
+gint            gtk_scale_get_digits     (GtkScale        *scale);
+void            gtk_scale_set_draw_value (GtkScale        *scale,
+                                          gboolean         draw_value);
+gboolean        gtk_scale_get_draw_value (GtkScale        *scale);
+void            gtk_scale_set_value_pos  (GtkScale        *scale,
+                                          GtkPositionType  pos);
+GtkPositionType gtk_scale_get_value_pos  (GtkScale        *scale);
+
+
+void    _gtk_scale_get_value_size  (GtkScale        *scale,
+                                    gint            *width,
+                                    gint            *height);
 gchar  *_gtk_scale_format_value   (GtkScale        *scale,
                                    gdouble          value);