X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscrollbar.c;h=63cdf381cd6fe11ba54cfe731d6b7f9dc2cfda6d;hb=a41b73fbc71f613e4ca90ae8b9dd3bd317d026d6;hp=df4ad75b9c57dab277ff7c67e395d487cff29b21;hpb=0d786985a368d88e8ab4e45fc3607efc5e773732;p=~andy%2Fgtk

diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index df4ad75b9..63cdf381c 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -28,36 +26,35 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
 
 /**
  * SECTION:gtkscrollbar
- * @Short_description: Base class for GtkHScrollbar and GtkVScrollbar
+ * @Short_description: A Scrollbar
  * @Title: GtkScrollbar
- * @See_also: #GtkHScrollbar, #GtkVScrollbar, #GtkAdjustment,
- *   #GtkScrolledWindow
+ * @See_also: #GtkAdjustment, #GtkScrolledWindow
  *
- * The #GtkScrollbar widget is the base class for #GtkHScrollbar and
- * #GtkVScrollbar. It can be used in the same way as these, by setting
- * the "orientation" property appropriately.
+ * The #GtkScrollbar widget is a horizontal or vertical scrollbar,
+ * depending on the value of the #GtkOrientable:orientation property.
  *
  * The position of the thumb in a scrollbar is controlled by the scroll
  * adjustments. See #GtkAdjustment for the fields in an adjustment - for
- * #GtkScrollbar, the #GtkAdjustment.value field represents the position
- * of the scrollbar, which must be between the #GtkAdjustment.lower field
- * and #GtkAdjustment.upper - #GtkAdjustment.page_size. The
- * #GtkAdjustment.page_size field represents the size of the visible
- * scrollable area. The #GtkAdjustment.step_increment and
- * #GtkAdjustment.page_increment fields are used when the user asks to
+ * #GtkScrollbar, the #GtkAdjustment:value field represents the position
+ * of the scrollbar, which must be between the #GtkAdjustment:lower field
+ * and #GtkAdjustment:upper - #GtkAdjustment:page-size. The
+ * #GtkAdjustment:page-size field represents the size of the visible
+ * scrollable area. The #GtkAdjustment:step-increment and
+ * #GtkAdjustment:page-increment fields are properties when the user asks to
  * step down (using the small stepper arrows) or page down (using for
  * example the <keycap>PageDown</keycap> key).
  */
 
 
-static void gtk_scrollbar_style_set (GtkWidget *widget,
-                                     GtkStyle  *previous);
+static void gtk_scrollbar_style_updated (GtkWidget *widget);
 
 G_DEFINE_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE)
 
@@ -66,9 +63,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  widget_class->style_set = gtk_scrollbar_style_set;
-
-  GTK_RANGE_CLASS (class)->stepper_detail = "Xscrollbar";
+  widget_class->style_updated = gtk_scrollbar_style_updated;
 
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_int ("min-slider-length",
@@ -113,25 +108,18 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                  P_("Display a second forward arrow button on the opposite end of the scrollbar"),
                                                                  FALSE,
                                                                  GTK_PARAM_READABLE));
-}
 
-static void
-gtk_scrollbar_init (GtkScrollbar *scrollbar)
-{
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SCROLL_BAR);
 }
 
 static void
-gtk_scrollbar_style_set (GtkWidget *widget,
-                         GtkStyle  *previous)
+gtk_scrollbar_update_style (GtkScrollbar *scrollbar)
 {
-  GtkRange *range = GTK_RANGE (widget);
   gint slider_length;
   gboolean fixed_size;
   gboolean has_a, has_b, has_c, has_d;
+  GtkRange *range = GTK_RANGE (scrollbar);
+  GtkWidget *widget = GTK_WIDGET (scrollbar);
 
   gtk_widget_style_get (widget,
                         "min-slider-length", &slider_length,
@@ -146,8 +134,23 @@ gtk_scrollbar_style_set (GtkWidget *widget,
   gtk_range_set_slider_size_fixed (range, fixed_size);
   _gtk_range_set_steppers (range,
                            has_a, has_b, has_c, has_d);
+}
 
-  GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_set (widget, previous);
+static void
+gtk_scrollbar_init (GtkScrollbar *scrollbar)
+{
+  GtkStyleContext *context;
+
+  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
+  gtk_scrollbar_update_style (scrollbar);
+}
+
+static void
+gtk_scrollbar_style_updated (GtkWidget *widget)
+{
+  gtk_scrollbar_update_style (GTK_SCROLLBAR (widget));
+  GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_updated (widget);
 }
 
 /**