X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscrollbar.c;h=63cdf381cd6fe11ba54cfe731d6b7f9dc2cfda6d;hb=45ad8a06ad511ad95a74172172b9fe459bc666ad;hp=01825a98df26cadaaae6d46fb9349df70a5b2780;hpb=52711beba57239aadde460d49d492ef6951f9335;p=~andy%2Fgtk
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 01825a98d..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 .
*/
/*
@@ -28,11 +26,11 @@
#include "config.h"
#include "gtkscrollbar.h"
+
+#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkprivate.h"
-#include "a11y/gtkscrollbaraccessible.h"
-
/**
* SECTION:gtkscrollbar
@@ -45,12 +43,12 @@
*
* 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 PageDown key).
*/
@@ -111,25 +109,17 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
FALSE,
GTK_PARAM_READABLE));
- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCROLLBAR_ACCESSIBLE);
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SCROLL_BAR);
}
static void
-gtk_scrollbar_init (GtkScrollbar *scrollbar)
+gtk_scrollbar_update_style (GtkScrollbar *scrollbar)
{
- GtkStyleContext *context;
-
- context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
-}
-
-static void
-gtk_scrollbar_style_updated (GtkWidget *widget)
-{
- 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,
@@ -144,7 +134,22 @@ gtk_scrollbar_style_updated (GtkWidget *widget)
gtk_range_set_slider_size_fixed (range, fixed_size);
_gtk_range_set_steppers (range,
has_a, has_b, has_c, has_d);
+}
+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);
}