From 968f80dfab550c47c67cd9341f40327ec38d7b3a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 May 2005 05:01:04 +0000 Subject: [PATCH] Add getters for the scrollbars. (#167181, Billy Biggs) 2005-05-03 Matthias Clasen * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_vscrollbar): * gtk/gtk.symbols: Add getters for the scrollbars. (#167181, Billy Biggs) --- ChangeLog | 6 +++++- ChangeLog.pre-2-10 | 6 +++++- ChangeLog.pre-2-8 | 6 +++++- gtk/gtk.symbols | 2 ++ gtk/gtkscrolledwindow.c | 38 ++++++++++++++++++++++++++++++++++++++ gtk/gtkscrolledwindow.h | 4 ++++ 6 files changed, 59 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfd61c3186..62d2a20bac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2005-05-03 Matthias Clasen - * gtk/gtk.symbols: + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_vscrollbar): + * gtk/gtk.symbols: Add getters for the scrollbars. (#167181, + Billy Biggs) + * gtk/gtkdialog.h: * gtk/gtkdialog.c (gtk_dialog_get_response_for_widget): Make this function public. (#170748, Morten Welinder) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cfd61c3186..62d2a20bac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,6 +1,10 @@ 2005-05-03 Matthias Clasen - * gtk/gtk.symbols: + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_vscrollbar): + * gtk/gtk.symbols: Add getters for the scrollbars. (#167181, + Billy Biggs) + * gtk/gtkdialog.h: * gtk/gtkdialog.c (gtk_dialog_get_response_for_widget): Make this function public. (#170748, Morten Welinder) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cfd61c3186..62d2a20bac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,6 +1,10 @@ 2005-05-03 Matthias Clasen - * gtk/gtk.symbols: + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_vscrollbar): + * gtk/gtk.symbols: Add getters for the scrollbars. (#167181, + Billy Biggs) + * gtk/gtkdialog.h: * gtk/gtkdialog.c (gtk_dialog_get_response_for_widget): Make this function public. (#170748, Morten Welinder) diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index fc46bac5df..c87b58edef 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2525,11 +2525,13 @@ gtk_scrollbar_get_type G_GNUC_CONST #if IN_FILE(__GTK_SCROLLED_WINDOW_C__) gtk_scrolled_window_add_with_viewport gtk_scrolled_window_get_hadjustment +gtk_scrolled_window_get_hscrollbar gtk_scrolled_window_get_placement gtk_scrolled_window_get_policy gtk_scrolled_window_get_shadow_type gtk_scrolled_window_get_type G_GNUC_CONST gtk_scrolled_window_get_vadjustment +gtk_scrolled_window_get_vscrollbar gtk_scrolled_window_new gtk_scrolled_window_set_hadjustment gtk_scrolled_window_set_placement diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 59f244b3d3..ff2ff94cba 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -495,6 +495,44 @@ gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_window) NULL); } +/** + * gtk_scrolled_window_get_hscrollbar: + * @scrolled_window: a #GtkScrolledWindow + * + * Returns the horizontal scrollbar of @scrolled_window. + * + * Returns: the horizontal scrollbar of the scrolled window, or + * %NULL if it does not have one. + * + * Since: 2.8 + */ +GtkHScrollbar* +gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *scrolled_window) +{ + g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL); + + return scrolled_window->hscrollbar; +} + +/** + * gtk_scrolled_window_get_vscrollbar: + * @scrolled_window: a #GtkScrolledWindow + * + * Returns the vertical scrollbar of @scrolled_window. + * + * Returns: the vertical scrollbar of the scrolled window, or + * %NULL if it does not have one. + * + * Since: 2.8 + */ +GtkVScrollbar* +gtk_scrolled_window_get_vscrollbar (GtkScrolledWindow *scrolled_window) +{ + g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL); + + return scrolled_window->vscrollbar; +} + void gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window, GtkPolicyType hscrollbar_policy, diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index b3a74aa43b..a70d578e00 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -55,9 +55,11 @@ struct _GtkScrolledWindow { GtkBin container; + /*< public >*/ GtkWidget *hscrollbar; GtkWidget *vscrollbar; + /*< private >*/ guint hscrollbar_policy : 2; guint vscrollbar_policy : 2; guint hscrollbar_visible : 1; @@ -105,6 +107,8 @@ void gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolle GtkAdjustment *hadjustment); GtkAdjustment* gtk_scrolled_window_get_hadjustment (GtkScrolledWindow *scrolled_window); GtkAdjustment* gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_window); +GtkHScrollbar* gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *scrolled_window); +GtkVScrollbar* gtk_scrolled_window_get_vscrollbar (GtkScrolledWindow *scrolled_window); void gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window, GtkPolicyType hscrollbar_policy, GtkPolicyType vscrollbar_policy);