--- a/src/widget.cpp	Sun Apr 15 17:04:44 2007 +0000
+++ b/src/widget.cpp	Sat Apr 21 08:23:57 2007 +0000
@@ -36,16 +36,13 @@
 	return pt;
 }
 
-/*****************************************************
- * Special handling for the scrollbar widget type.
+/** Special handling for the scrollbar widget type.
  * Handles the special scrolling buttons and other
  * scrolling.
- * Parameters:
- *   wi  - Pointer to the scrollbar widget.
- *   x   - The X coordinate of the mouse click.
- *   y   - The Y coordinate of the mouse click.
- */
-
+ * @param w Window on which a scroll was performed.
+ * @param wi Pointer to the scrollbar widget.
+ * @param x The X coordinate of the mouse click.
+ * @param y The Y coordinate of the mouse click. */
 void BaseWindow::ScrollbarClickHandler(const OldWidget *wi, int x, int y)
 {
 	int mi, ma, pos;
@@ -126,8 +123,8 @@
 
 /** Returns the index for the widget located at the given position
  * relative to the window. It includes all widget-corner pixels as well.
- * @param  x
- * @param  y Window client coordinates
+ * @param  x The Window client X coordinate
+ * @param  y The Window client y coordinate
  * @return A widget index, or -1 if no widget was found.
  */
 int BaseWindow::GetWidgetFromPos(int x, int y) const
@@ -735,6 +732,10 @@
 
 /** Evenly distribute some widgets when resizing horizontally (often a button row)
  *  When only two arguments are given, the widgets are presumed to be on a line and only the ends are given
+<<<<<<< .working
+=======
+ * @param w Window to modify
+>>>>>>> .merge-right.r9707
  * @param left The leftmost widget to resize
  * @param right The rightmost widget to resize. Since right side of it is used, remember to set it to RESIZE_RIGHT
  */