From b91bf99b4ca804c5e5475ce5afe5b38ffa90c8d5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 May 2005 03:37:43 +0000 Subject: [PATCH] Change the return type to GtkWidget*, proposed by Owen Taylor. 2005-05-07 Matthias Clasen * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_hscrollbar): (gtk_scrolled_window_get_cscrollbar): Change the return type to GtkWidget*, proposed by Owen Taylor. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkscrolledwindow.c | 4 ++-- gtk/gtkscrolledwindow.h | 4 ++-- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c9cff290..6985b61ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-05-07 Matthias Clasen + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_hscrollbar): + (gtk_scrolled_window_get_cscrollbar): Change the return + type to GtkWidget*, proposed by Owen Taylor. + * gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) (gdk_screen_get_height_mm): Fix typos in the docs. (#303389, Masao Mutoh) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c9cff290..6985b61ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-05-07 Matthias Clasen + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_hscrollbar): + (gtk_scrolled_window_get_cscrollbar): Change the return + type to GtkWidget*, proposed by Owen Taylor. + * gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) (gdk_screen_get_height_mm): Fix typos in the docs. (#303389, Masao Mutoh) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c9cff290..6985b61ff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-05-07 Matthias Clasen + * gtk/gtkscrolledwindow.h: + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_get_hscrollbar): + (gtk_scrolled_window_get_cscrollbar): Change the return + type to GtkWidget*, proposed by Owen Taylor. + * gdk/x11/gdkscreen-x11.c (gdk_screen_get_width_mm) (gdk_screen_get_height_mm): Fix typos in the docs. (#303389, Masao Mutoh) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index ff2ff94cb..af2454913 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -506,7 +506,7 @@ gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_window) * * Since: 2.8 */ -GtkHScrollbar* +GtkWidget* gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *scrolled_window) { g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL); @@ -525,7 +525,7 @@ gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *scrolled_window) * * Since: 2.8 */ -GtkVScrollbar* +GtkWidget* gtk_scrolled_window_get_vscrollbar (GtkScrolledWindow *scrolled_window) { g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL); diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index a70d578e0..729de2759 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -107,8 +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); +GtkWidget* gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *scrolled_window); +GtkWidget* gtk_scrolled_window_get_vscrollbar (GtkScrolledWindow *scrolled_window); void gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window, GtkPolicyType hscrollbar_policy, GtkPolicyType vscrollbar_policy); -- 2.43.2