Change the return type to GtkWidget*, proposed by Owen Taylor.

2005-05-07  Matthias Clasen  <mclasen@redhat.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 2c9cff290e70de38239de0c2f2aae5ab4408f71b..6985b61ff5245e6d4f333d370f8ad9f6cac5a17e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2c9cff290e70de38239de0c2f2aae5ab4408f71b..6985b61ff5245e6d4f333d370f8ad9f6cac5a17e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-05-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 2c9cff290e70de38239de0c2f2aae5ab4408f71b..6985b61ff5245e6d4f333d370f8ad9f6cac5a17e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-05-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ff2ff94cbae7a387b47b8c084bc8f48d0d68378c..af2454913864f52c31d58e7fa0c52ec9ecfd81a0 100644 (file)
--- 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 a70d578e004757aae435e318aadba46a300bfa1c..729de2759e6dc5f3d07dc1a820ef6424484bfff4 100644 (file)
--- 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);