Fixes to account for the changed structure of the windows of range

Tue Feb  2 11:06:02 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkrange.c (gtk_range_style_set): Fixes
	 to account for the changed structure of the windows
	 of range widgets.

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index b81d213ed030066011a8b1c057d6cf23d212db4f..f9dae953636bc115fae92ead1d72132c053ba1d0 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1553,29 +1553,18 @@ gtk_range_style_set (GtkWidget *widget,
 
   range = GTK_RANGE (widget);
 
-  if (GTK_WIDGET_REALIZED (widget) &&
-      !GTK_WIDGET_NO_WINDOW (widget))
+  if (GTK_WIDGET_REALIZED (widget))
     {
-       if (range->trough)
-       {
-         gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
-         if (GTK_WIDGET_DRAWABLE (widget))
-           gdk_window_clear (range->trough);
-       }
-      /* The draw will take care of the slider */
+      if (range->trough)
+       gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
 
+      if (range->slider)
+       gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
+      
       if (range->step_forw)
-       {
-         gtk_style_set_background (widget->style, range->step_forw, GTK_STATE_ACTIVE);
-         if (GTK_WIDGET_DRAWABLE (widget))
-           gdk_window_clear (range->step_forw);
-       }
+       gtk_style_set_background (widget->style, range->step_forw, GTK_STATE_ACTIVE);
+
       if (range->step_back)
-       {
-         gtk_style_set_background (widget->style, range->step_back, GTK_STATE_ACTIVE);
-         if (GTK_WIDGET_DRAWABLE (widget))
-           gdk_window_clear (range->step_back);
-       }
-       gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+       gtk_style_set_background (widget->style, range->step_back, GTK_STATE_ACTIVE);
     }
 }