Merged up to trunk R732

[ardour.git] / gtk2_ardour / gtkscrolledwindow.c

diff --git a/gtk2_ardour/gtkscrolledwindow.c b/gtk2_ardour/gtkscrolledwindow.c
index 4161ea1baa10cf16c1dea75ff4bfe72b1e7b2cd8..dcb6372afac61d7c63aa8f4da3186bb0f81c407f 100644 (file)
--- a/gtk2_ardour/gtkscrolledwindow.c
+++ b/gtk2_ardour/gtkscrolledwindow.c
@@ -518,13 +518,15 @@ gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window,
     }
 }
 
-/** * Retrieves the current policy values for the horizontal and vertical
+/**
+ * gtk_scrolled_window_get_policy:
+ * @scrolled_window: a #GtkScrolledWindow
+ * @hscrollbar_policy: location to store the policy for the horizontal scrollbar, or %NULL.
+ * @vscrollbar_policy: location to store the policy for the horizontal scrollbar, or %NULL.
+ * 
+ * Retrieves the current policy values for the horizontal and vertical
  * scrollbars. See gtk_scrolled_window_set_policy().
- *
- * @param scrolled_window a GtkScrolledWindow
- * @param hscrollbar_policy location to store the policy for the horizontal scrollbar, or %NULL.
- * @param vscrollbar_policy location to store the policy for the horizontal scrollbar, or %NULL.
- */
+ **/
 void
 gtk_scrolled_window_get_policy (GtkScrolledWindow *scrolled_window,
                                GtkPolicyType     *hscrollbar_policy,
@@ -554,11 +556,14 @@ gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window,
     }
 }
 
-/** Gets the placement of the scrollbars for the scrolled window.
- * See gtk_scrolled_window_set_placement().
+/**
+ * gtk_scrolled_window_get_placement:
+ * @scrolled_window: a #GtkScrolledWindow
  *
- * @param scrolled_window a GtkScrolledWindow
- * \return the current placement value.
+ * Gets the placement of the scrollbars for the scrolled window. See 
+ * gtk_scrolled_window_set_placement().
+ *
+ * Return value: the current placement value.
  **/
 GtkCornerType
 gtk_scrolled_window_get_placement (GtkScrolledWindow *scrolled_window)
@@ -568,10 +573,15 @@ gtk_scrolled_window_get_placement (GtkScrolledWindow *scrolled_window)
   return scrolled_window->window_placement;
 }
 
-/** Changes the type of shadow drawn around the contents of \a scrolled_window.
- * @param scrolled_window a GtkScrolledWindow
- * @param type kind of shadow to draw around scrolled window contents
- */
+/**
+ * gtk_scrolled_window_set_shadow_type:
+ * @scrolled_window: a #GtkScrolledWindow
+ * @type: kind of shadow to draw around scrolled window contents
+ *
+ * Changes the type of shadow drawn around the contents of
+ * @scrolled_window.
+ * 
+ **/
 void
 gtk_scrolled_window_set_shadow_type (GtkScrolledWindow *scrolled_window,
                                     GtkShadowType      type)
@@ -592,12 +602,15 @@ gtk_scrolled_window_set_shadow_type (GtkScrolledWindow *scrolled_window,
     }
 }
 
-/** Gets the shadow type of the scrolled window.
- * See gtk_scrolled_window_set_shadow_type().
+/**
+ * gtk_scrolled_window_get_shadow_type:
+ * @scrolled_window: a #GtkScrolledWindow
  *
- * @param scrolled_window a GtkScrolledWindow
- * \return the current shadow type
- */
+ * Gets the shadow type of the scrolled window. See 
+ * gtk_scrolled_window_set_shadow_type().
+ *
+ * Return value: the current shadow type
+ **/
 GtkShadowType
 gtk_scrolled_window_get_shadow_type (GtkScrolledWindow *scrolled_window)
 {
@@ -1374,11 +1387,14 @@ gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
   gtk_container_add (GTK_CONTAINER (viewport), child);
 }
 
-/** Gets the spacing between the scrolled window's scrollbars and
- * the scrolled widget. Used by GtkCombo.
- *
- * @param scrolled_window: a scrolled window
- * \return the spacing, in pixels.
+/**
+ * _gtk_scrolled_window_get_spacing:
+ * @scrolled_window: a scrolled window
+ * 
+ * Gets the spacing between the scrolled window's scrollbars and
+ * the scrolled widget. Used by GtkCombo
+ * 
+ * Return value: the spacing, in pixels.
  **/
 gint
 _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window)