WP1 merged from my branch, WP2 reserved, todo list updated.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 6 insertions, 2 deletions

diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 04d94aa5c..c4a7ca8ce 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -85,13 +85,13 @@ Fl_Window *Fl_Widget::window() const {
     if (o->type() >= FL_WINDOW) return (Fl_Window*)o;
   return 0;
 }
-
+/** Gets the x position of the window on the screen */
 int Fl_Window::x_root() const {
   Fl_Window *p = window();
   if (p) return p->x_root() + x();
   return x();
 }
-
+/** Gets the y position of the window on the screen */
 int Fl_Window::y_root() const {
   Fl_Window *p = window();
   if (p) return p->y_root() + y();
@@ -159,6 +159,7 @@ void Fl_Window::iconlabel(const char *iname) {
 // the Fl::atclose pointer is provided for back compatability.  You
 // can now just change the callback for the window instead.
 
+/** Default callback for window widgets. It hides the window and then calls the default widget callback. */
 void Fl::default_atclose(Fl_Window* window, void* v) {
   window->hide();
   Fl_Widget::default_callback(window, v); // put on Fl::read_queue()
@@ -170,6 +171,9 @@ void Fl_Window::default_callback(Fl_Window* win, void* v) {
   Fl::atclose(win, v);
 }
 
+/**
+  Returns the last window that was made current.
+*/
 Fl_Window *Fl_Window::current() {
   return current_;
 }