Doxygen only: fixed all block comments starting with an asterisk to space-only, fixed doxygen keywords prepended with @ to use a backward slash instead. No code was changed.

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

9 files changed, 475 insertions, 475 deletions

diff --git a/src/drivers/Android/Fl_Android_Application.H b/src/drivers/Android/Fl_Android_Application.H
index 103c43dda..cb20decf9 100644
--- a/src/drivers/Android/Fl_Android_Application.H
+++ b/src/drivers/Android/Fl_Android_Application.H
@@ -41,7 +41,7 @@ extern void (*fl_lock_function)();
 
 
 /**
- * A class to make Java calls from C++ easier.
+ A class to make Java calls from C++ easier.
  */
 class Fl_Android_Java
 {
@@ -63,41 +63,41 @@ public:
 
 
 /**
- * Static class that manages all interaction between the Android Native Activity
- * and the FLTK library. It also keeps often used data for global access.
- *
- * On launch, it creates a main thread and communication pipe to
- * the Activity. All FLTK code will run in that thread. Activity
- * events will be polled by the Screen driver using the provided
- * Android Looper, and will also be routed back to this class as needed.
- *
- * This code is based on the native activity interface
- * provided by <android/native_activity.h>. It is based on a set
- * of application-provided callbacks that will be called
- * by the Activity's main thread when certain events occur.
- *
- * 1/ The application must provide a function named "int main(argc, argv)" that
- *    will be called when the activity is created, in a new thread that is
- *    distinct from the activity's main thread.
- *
- * 2/ The application has access to a static "Fl_Android_Application" class
- *    that contains references to other important objects, e.g. the
- *    ANativeActivity object instance the application is running in.
- *
- * 3/ the "Fl_Android_Application" class holds an ALooper instance that already
- *    listens to two important things:
- *
- *      - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX
- *        declarations below.
- *
- *      - input events coming from the AInputQueue attached to the activity.
- *
- *    Each of these correspond to an ALooper identifier returned by
- *    ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT,
- *    respectively.
- *
- *    FLTK will add more items to the looper for timers and file and socket
- *    communication. (fl_add_timeout, Fl::add_fd(), ...
+ Static class that manages all interaction between the Android Native Activity
+ and the FLTK library. It also keeps often used data for global access.
+
+ On launch, it creates a main thread and communication pipe to
+ the Activity. All FLTK code will run in that thread. Activity
+ events will be polled by the Screen driver using the provided
+ Android Looper, and will also be routed back to this class as needed.
+
+ This code is based on the native activity interface
+ provided by <android/native_activity.h>. It is based on a set
+ of application-provided callbacks that will be called
+ by the Activity's main thread when certain events occur.
+
+ 1/ The application must provide a function named "int main(argc, argv)" that
+    will be called when the activity is created, in a new thread that is
+    distinct from the activity's main thread.
+
+ 2/ The application has access to a static "Fl_Android_Application" class
+    that contains references to other important objects, e.g. the
+    ANativeActivity object instance the application is running in.
+
+ 3/ the "Fl_Android_Application" class holds an ALooper instance that already
+    listens to two important things:
+
+      - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX
+        declarations below.
+
+      - input events coming from the AInputQueue attached to the activity.
+
+    Each of these correspond to an ALooper identifier returned by
+    ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT,
+    respectively.
+
+    FLTK will add more items to the looper for timers and file and socket
+    communication. (fl_add_timeout, Fl::add_fd(), ...
  */
 class Fl_Android_Application
 {
diff --git a/src/drivers/Android/Fl_Android_Application.cxx b/src/drivers/Android/Fl_Android_Application.cxx
index 3a076bed3..8aac226ce 100644
--- a/src/drivers/Android/Fl_Android_Application.cxx
+++ b/src/drivers/Android/Fl_Android_Application.cxx
@@ -152,8 +152,8 @@ void Fl_Android_Application::free_saved_state()
 }
 
 /**
- * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
- * app command message.
+ Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
+ app command message.
  */
 int8_t Fl_Android_Application::read_cmd()
 {
@@ -201,9 +201,9 @@ void Fl_Android_Application::print_cur_config()
 }
 
 /**
- * Call with the command returned by android_app_read_cmd() to do the
- * initial pre-processing of the given command.  You can perform your own
- * actions for the command after calling this function.
+ Call with the command returned by android_app_read_cmd() to do the
+ initial pre-processing of the given command.  You can perform your own
+ actions for the command after calling this function.
  */
 void Fl_Android_Application::pre_exec_cmd(int8_t cmd)
 {
@@ -275,9 +275,9 @@ void Fl_Android_Application::pre_exec_cmd(int8_t cmd)
 }
 
 /**
- * Call with the command returned by read_cmd() to do the
- * final post-processing of the given command.  You must have done your own
- * actions for the command before calling this function.
+ Call with the command returned by read_cmd() to do the
+ final post-processing of the given command.  You must have done your own
+ actions for the command before calling this function.
  */
 void Fl_Android_Application::post_exec_cmd(int8_t cmd)
 {
@@ -384,10 +384,10 @@ void *Fl_Android_Application::thread_entry(void* param)
 }
 
 /**
- * Allocate memory for our internal screen buffer.
- *
- * FIXME: everything is currently hardcoded to an 600x800 resolution
- * TODO: react to screen changes
+ Allocate memory for our internal screen buffer.
+
+ FIXME: everything is currently hardcoded to an 600x800 resolution
+ TODO: react to screen changes
  */
 void Fl_Android_Application::allocate_screen()
 {
@@ -442,12 +442,12 @@ bool Fl_Android_Application::copy_screen()
 }
 
 /**
- * Take ownership of screen memory for gaining write access.
- *
- * If the screen is already locked, it will not be locked again
- * and a value of true will be returned.
- *
- * @return true if we gaines access, false if no access was granted and screen memory must not be writte to
+ Take ownership of screen memory for gaining write access.
+
+ If the screen is already locked, it will not be locked again
+ and a value of true will be returned.
+
+ \return true if we gaines access, false if no access was granted and screen memory must not be writte to
  */
 bool Fl_Android_Application::lock_screen()
 {
@@ -467,10 +467,10 @@ bool Fl_Android_Application::lock_screen()
 }
 
 /**
- * Release screen memory ownership and give it back to the system.
- *
- * The memory content will be copied to the physical screen next.
- * If the screen is not locked, this call will have no effect.
+ Release screen memory ownership and give it back to the system.
+
+ The memory content will be copied to the physical screen next.
+ If the screen is not locked, this call will have no effect.
  */
 void Fl_Android_Application::unlock_and_post_screen()
 {
@@ -482,8 +482,8 @@ void Fl_Android_Application::unlock_and_post_screen()
 }
 
 /**
- * Is the screen currently locked?
- * @return true if it is locked and the app has write access.
+ Is the screen currently locked?
+ \return true if it is locked and the app has write access.
  */
 bool Fl_Android_Application::screen_is_locked()
 {
@@ -563,7 +563,7 @@ void Fl_Android_Activity::close_activity()
 // ---- Android Native Activity callbacks ----
 
 /**
- * The rectangle in the window in which content should be placed has changed.
+ The rectangle in the window in which content should be placed has changed.
  */
 void Fl_Android_Activity::onContentRectChanged(ANativeActivity *activity, const ARect *rect)
 {
@@ -571,7 +571,7 @@ void Fl_Android_Activity::onContentRectChanged(ANativeActivity *activity, const
 }
 
 /**
- * The drawing window for this native activity needs to be redrawn. To avoid transient artifacts during screen changes (such resizing after rotation), applications should not return from this function until they have finished drawing their window in its current state.
+ The drawing window for this native activity needs to be redrawn. To avoid transient artifacts during screen changes (such resizing after rotation), applications should not return from this function until they have finished drawing their window in its current state.
  */
 void Fl_Android_Activity::onNativeWindowRedrawNeeded(ANativeActivity *activity, ANativeWindow *window)
 {
@@ -579,7 +579,7 @@ void Fl_Android_Activity::onNativeWindowRedrawNeeded(ANativeActivity *activity,
 }
 
 /**
- * The drawing window for this native activity has been resized. You should retrieve the new size from the window and ensure that your rendering in it now matches.
+ The drawing window for this native activity has been resized. You should retrieve the new size from the window and ensure that your rendering in it now matches.
  */
 void Fl_Android_Activity::onNativeWindowResized(ANativeActivity *activity, ANativeWindow *window)
 {
@@ -587,7 +587,7 @@ void Fl_Android_Activity::onNativeWindowResized(ANativeActivity *activity, ANati
 }
 
 /**
- * NativeActivity is being destroyed. See Java documentation for Activity.onDestroy() for more information.
+ NativeActivity is being destroyed. See Java documentation for Activity.onDestroy() for more information.
  */
 void Fl_Android_Activity::onDestroy(ANativeActivity* activity)
 {
@@ -597,7 +597,7 @@ void Fl_Android_Activity::onDestroy(ANativeActivity* activity)
 }
 
 /**
- * NativeActivity has started. See Java documentation for Activity.onStart() for more information.
+ NativeActivity has started. See Java documentation for Activity.onStart() for more information.
  */
 void Fl_Android_Activity::onStart(ANativeActivity* activity)
 {
@@ -606,7 +606,7 @@ void Fl_Android_Activity::onStart(ANativeActivity* activity)
 }
 
 /**
- * NativeActivity has resumed. See Java documentation for Activity.onResume() for more information.
+ NativeActivity has resumed. See Java documentation for Activity.onResume() for more information.
  */
 void Fl_Android_Activity::onResume(ANativeActivity* activity)
 {
@@ -615,7 +615,7 @@ void Fl_Android_Activity::onResume(ANativeActivity* activity)
 }
 
 /**
- * Framework is asking NativeActivity to save its current instance state. See Java documentation for Activity.onSaveInstanceState() for more information. The returned pointer needs to be created with malloc(); the framework will call free() on it for you. You also must fill in outSize with the number of bytes in the allocation. Note that the saved state will be persisted, so it can not contain any active entities (pointers to memory, file descriptors, etc).
+ Framework is asking NativeActivity to save its current instance state. See Java documentation for Activity.onSaveInstanceState() for more information. The returned pointer needs to be created with malloc(); the framework will call free() on it for you. You also must fill in outSize with the number of bytes in the allocation. Note that the saved state will be persisted, so it can not contain any active entities (pointers to memory, file descriptors, etc).
  */
 void *Fl_Android_Activity::onSaveInstanceState(ANativeActivity* activity, size_t* outLen)
 {
@@ -643,7 +643,7 @@ void *Fl_Android_Activity::onSaveInstanceState(ANativeActivity* activity, size_t
 }
 
 /**
- * NativeActivity has paused. See Java documentation for Activity.onPause() for more information.
+ NativeActivity has paused. See Java documentation for Activity.onPause() for more information.
  */
 void Fl_Android_Activity::onPause(ANativeActivity* activity)
 {
@@ -652,7 +652,7 @@ void Fl_Android_Activity::onPause(ANativeActivity* activity)
 }
 
 /**
- * NativeActivity has stopped. See Java documentation for Activity.onStop() for more information.
+ NativeActivity has stopped. See Java documentation for Activity.onStop() for more information.
  */
 void Fl_Android_Activity::onStop(ANativeActivity* activity)
 {
@@ -661,7 +661,7 @@ void Fl_Android_Activity::onStop(ANativeActivity* activity)
 }
 
 /**
- * The current device AConfiguration has changed. The new configuration can be retrieved from assetManager.
+ The current device AConfiguration has changed. The new configuration can be retrieved from assetManager.
  */
 void Fl_Android_Activity::onConfigurationChanged(ANativeActivity* activity)
 {
@@ -671,7 +671,7 @@ void Fl_Android_Activity::onConfigurationChanged(ANativeActivity* activity)
 }
 
 /**
- * The system is running low on memory. Use this callback to release resources you do not need, to help the system avoid killing more important processes.
+ The system is running low on memory. Use this callback to release resources you do not need, to help the system avoid killing more important processes.
  */
 void Fl_Android_Activity::onLowMemory(ANativeActivity* activity)
 {
@@ -681,7 +681,7 @@ void Fl_Android_Activity::onLowMemory(ANativeActivity* activity)
 }
 
 /**
- * Focus has changed in this NativeActivity's window. This is often used, for example, to pause a game when it loses input focus.
+ Focus has changed in this NativeActivity's window. This is often used, for example, to pause a game when it loses input focus.
  */
 void Fl_Android_Activity::onWindowFocusChanged(ANativeActivity* activity, int focused)
 {
@@ -690,7 +690,7 @@ void Fl_Android_Activity::onWindowFocusChanged(ANativeActivity* activity, int fo
 }
 
 /**
- * The drawing window for this native activity has been created. You can use the given native window object to start drawing.
+ The drawing window for this native activity has been created. You can use the given native window object to start drawing.
  */
 void Fl_Android_Activity::onNativeWindowCreated(ANativeActivity* activity, ANativeWindow* window)
 {
@@ -699,7 +699,7 @@ void Fl_Android_Activity::onNativeWindowCreated(ANativeActivity* activity, ANati
 }
 
 /**
- * The drawing window for this native activity is going to be destroyed. You MUST ensure that you do not touch the window object after returning from this function: in the common case of drawing to the window from another thread, that means the implementation of this callback must properly synchronize with the other thread to stop its drawing before returning from here.
+ The drawing window for this native activity is going to be destroyed. You MUST ensure that you do not touch the window object after returning from this function: in the common case of drawing to the window from another thread, that means the implementation of this callback must properly synchronize with the other thread to stop its drawing before returning from here.
  */
 void Fl_Android_Activity::onNativeWindowDestroyed(ANativeActivity* activity, ANativeWindow* window)
 {
@@ -708,7 +708,7 @@ void Fl_Android_Activity::onNativeWindowDestroyed(ANativeActivity* activity, ANa
 }
 
 /**
- * The input queue for this native activity's window has been created. You can use the given input queue to start retrieving input events.
+ The input queue for this native activity's window has been created. You can use the given input queue to start retrieving input events.
  */
 void Fl_Android_Activity::onInputQueueCreated(ANativeActivity* activity, AInputQueue* queue)
 {
@@ -717,7 +717,7 @@ void Fl_Android_Activity::onInputQueueCreated(ANativeActivity* activity, AInputQ
 }
 
 /**
- * The input queue for this native activity's window is being destroyed. You should no longer try to reference this object upon returning from this function.
+ The input queue for this native activity's window is being destroyed. You should no longer try to reference this object upon returning from this function.
  */
 void Fl_Android_Activity::onInputQueueDestroyed(ANativeActivity* activity, AInputQueue* queue)
 {
@@ -726,10 +726,10 @@ void Fl_Android_Activity::onInputQueueDestroyed(ANativeActivity* activity, AInpu
 }
 
 /**
- * Create a thread that will run our FLTK code and the required communications and locks.
- * @param activity the interface to the Java end of Android
- * @param savedState if this app is relaunched, this is a memory block with the state of the app when it was interrupted
- * @param savedStateSize size of that block
+ Create a thread that will run our FLTK code and the required communications and locks.
+ \param activity the interface to the Java end of Android
+ \param savedState if this app is relaunched, this is a memory block with the state of the app when it was interrupted
+ \param savedStateSize size of that block
  */
 void Fl_Android_Activity::create(ANativeActivity* activity, void* savedState,
                                  size_t savedStateSize)
@@ -773,7 +773,7 @@ void Fl_Android_Activity::create(ANativeActivity* activity, void* savedState,
 }
 
 /**
- * Set all callbacks from the Native Activity.
+ Set all callbacks from the Native Activity.
  */
 void Fl_Android_Activity::set_callbacks()
 {
@@ -797,7 +797,7 @@ void Fl_Android_Activity::set_callbacks()
 }
 
 /**
- * This is the main entry point from the Android JavaVM into the native world.
+ This is the main entry point from the Android JavaVM into the native world.
  */
 JNIEXPORT void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, size_t savedStateSize)
 {
diff --git a/src/drivers/Android/Fl_Android_Graphics_Clipping.H b/src/drivers/Android/Fl_Android_Graphics_Clipping.H
index 349be87e1..863c1d51b 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Clipping.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Clipping.H
@@ -32,11 +32,11 @@ class Fl_Android_Window_Driver;
 
 
 /**
- * The Fl_Rect_Region describes a rectangular clipping region.
- *
- * Contrary to common FLTK convention, rectangles are stored with coordinates
- * instead of their width and height to accelerate calculations. The discreet
- * constructor however uses the old convention for convenience.
+ The Fl_Rect_Region describes a rectangular clipping region.
+
+ Contrary to common FLTK convention, rectangles are stored with coordinates
+ instead of their width and height to accelerate calculations. The discreet
+ constructor however uses the old convention for convenience.
  */
 class Fl_Rect_Region
 {
@@ -82,35 +82,35 @@ private:
 
 
 /**
- * The Fl_Complex_Region represents a clipping region of any shape.
- *
- * This class is organized in a tree-like structure. If the region is
- * rectangular, is_simple() returns 1 and the rectangle can be used just
- * as in Fl_Rect_Region.
- *
- * If a more complex representation is needed, subregions are created which are
- * guaranteed to lie within the bounding box of the current region. Subregions
- * themselves can again contain sub-subregions to describe the entire clipping
- * region, effectively creating a tree where the leafs contain the rectangles
- * that together describe the clipping area.
- *
- * To make life easier, Fl_Complex_Region provides two types of iterator to
- * travers the entire tree.
- *
- * 1. Fl_Complex_Region itself is compatible to C++11 range-based loops and
- *    can bewalked simply by writing ``for (auto &&it: rgn) { ... }``.
- *
- * 2. Fl_Complex_Region provides an alternative iterator that loop only through
- *    leafs that intersects with a given rectangle. The returned object
- *    provides access to the readily clipped rectangle.
- *
- * @code
- * Fl_Complex_Region rgn(something);
- * for (auto &&it: rgn.iterate(Fl_Rect_Region(0, 0, 100, 100)) {
- *    draw_something(it->rect());
- * }
- * @endcode
- *
+ The Fl_Complex_Region represents a clipping region of any shape.
+
+ This class is organized in a tree-like structure. If the region is
+ rectangular, is_simple() returns 1 and the rectangle can be used just
+ as in Fl_Rect_Region.
+
+ If a more complex representation is needed, subregions are created which are
+ guaranteed to lie within the bounding box of the current region. Subregions
+ themselves can again contain sub-subregions to describe the entire clipping
+ region, effectively creating a tree where the leafs contain the rectangles
+ that together describe the clipping area.
+
+ To make life easier, Fl_Complex_Region provides two types of iterator to
+ travers the entire tree.
+
+ 1. Fl_Complex_Region itself is compatible to C++11 range-based loops and
+    can bewalked simply by writing ``for (auto &&it: rgn) { ... }``.
+
+ 2. Fl_Complex_Region provides an alternative iterator that loop only through
+    leafs that intersects with a given rectangle. The returned object
+    provides access to the readily clipped rectangle.
+
+ \code
+ Fl_Complex_Region rgn(something);
+ for (auto &&it: rgn.iterate(Fl_Rect_Region(0, 0, 100, 100)) {
+    draw_something(it->rect());
+ }
+ \endcode
+
  */
 class Fl_Complex_Region : public Fl_Rect_Region
 {
diff --git a/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx b/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
index b2fcff09e..4de919922 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
@@ -24,7 +24,7 @@
 
 
 /**
- * Create an empty clipping region.
+ Create an empty clipping region.
  */
 Fl_Rect_Region::Fl_Rect_Region() :
         pLeft(0), pTop(0), pRight(0), pBottom(0)
@@ -32,9 +32,9 @@ Fl_Rect_Region::Fl_Rect_Region() :
 }
 
 /**
- * Create a clipping region based on position and size.
- * @param x, y position
- * @param w, h size
+ Create a clipping region based on position and size.
+ \param x, y position
+ \param w, h size
  */
 Fl_Rect_Region::Fl_Rect_Region(int x, int y, int w, int h) :
         pLeft(x), pTop(y), pRight(x+w), pBottom(y+h)
@@ -42,7 +42,7 @@ Fl_Rect_Region::Fl_Rect_Region(int x, int y, int w, int h) :
 }
 
 /**
- * Clone a clipping rectangle.
+ Clone a clipping rectangle.
  */
 Fl_Rect_Region::Fl_Rect_Region(const Fl_Rect_Region &r) :
         pLeft(r.pLeft), pTop(r.pTop),
@@ -51,8 +51,8 @@ Fl_Rect_Region::Fl_Rect_Region(const Fl_Rect_Region &r) :
 }
 
 /**
- * Clone a clipping rectangle.
- * The pointer can be NULL if an empty rectangle is needed.
+ Clone a clipping rectangle.
+ The pointer can be NULL if an empty rectangle is needed.
  */
 Fl_Rect_Region::Fl_Rect_Region(enum Type what)
 {
@@ -65,8 +65,8 @@ Fl_Rect_Region::Fl_Rect_Region(enum Type what)
 }
 
 /**
- * If the rectangle has no width or height, it's considered empty.
- * @return true, if everything will be clipped and there is nothing to draw
+ If the rectangle has no width or height, it's considered empty.
+ \return true, if everything will be clipped and there is nothing to draw
  */
 bool Fl_Rect_Region::is_empty() const
 {
@@ -74,8 +74,8 @@ bool Fl_Rect_Region::is_empty() const
 }
 
 /**
- * Return true, if the rectangle is of unlimited size and nothing should be clipped.
- * @return treu, if there is no clipping
+ Return true, if the rectangle is of unlimited size and nothing should be clipped.
+ \return treu, if there is no clipping
  */
 bool Fl_Rect_Region::is_infinite() const
 {
@@ -83,7 +83,7 @@ bool Fl_Rect_Region::is_infinite() const
 }
 
 /**
- * Set an empty clipping rect.
+ Set an empty clipping rect.
  */
 void Fl_Rect_Region::set_empty()
 {
@@ -91,9 +91,9 @@ void Fl_Rect_Region::set_empty()
 }
 
 /**
- * Set a clipping rect using position and size
- * @param x, y position
- * @param w, h size
+ Set a clipping rect using position and size
+ \param x, y position
+ \param w, h size
  */
 void Fl_Rect_Region::set(int x, int y, int w, int h)
 {
@@ -104,9 +104,9 @@ void Fl_Rect_Region::set(int x, int y, int w, int h)
 }
 
 /**
- * Set a rectangle using the coordinates of two points, top left and bottom right.
- * @param l, t left and top coordinate
- * @param r, b right and bottom coordinate
+ Set a rectangle using the coordinates of two points, top left and bottom right.
+ \param l, t left and top coordinate
+ \param r, b right and bottom coordinate
  */
 void Fl_Rect_Region::set_ltrb(int l, int t, int r, int b)
 {
@@ -117,8 +117,8 @@ void Fl_Rect_Region::set_ltrb(int l, int t, int r, int b)
 }
 
 /**
- * Copy the corrdinates from another rect.
- * @param r source rectangle
+ Copy the corrdinates from another rect.
+ \param r source rectangle
  */
 void Fl_Rect_Region::set(const Fl_Rect_Region &r)
 {
@@ -129,10 +129,10 @@ void Fl_Rect_Region::set(const Fl_Rect_Region &r)
 }
 
 /**
- * Set this rect to be the intersecting area between the original rect and another rect.
- * @param r another rectangular region
- * @return EMPTY, if rectangles are not intersecting, SAME if this and rect are
- *      equal, LESS if the new rect is smaller than the original rect
+ Set this rect to be the intersecting area between the original rect and another rect.
+ \param r another rectangular region
+ \return EMPTY, if rectangles are not intersecting, SAME if this and rect are
+      equal, LESS if the new rect is smaller than the original rect
  */
 int Fl_Rect_Region::intersect_with(const Fl_Rect_Region &r)
 {
@@ -168,7 +168,7 @@ int Fl_Rect_Region::intersect_with(const Fl_Rect_Region &r)
 }
 
 /**
- * Use rectangle as a bounding box and add the outline of another rect.
+ Use rectangle as a bounding box and add the outline of another rect.
  */
 void Fl_Rect_Region::add_to_bbox(const Fl_Rect_Region &r)
 {
@@ -180,8 +180,8 @@ void Fl_Rect_Region::add_to_bbox(const Fl_Rect_Region &r)
 }
 
 /**
- * Print the coordinates of the rect to the log.
- * @param label some text that is logged with this message.
+ Print the coordinates of the rect to the log.
+ \param label some text that is logged with this message.
  */
 void Fl_Rect_Region::print(const char *label) const
 {
@@ -192,7 +192,7 @@ void Fl_Rect_Region::print(const char *label) const
 // =============================================================================
 
 /**
- * Create an empty complex region.
+ Create an empty complex region.
  */
 Fl_Complex_Region::Fl_Complex_Region() :
         Fl_Rect_Region()
@@ -200,8 +200,8 @@ Fl_Complex_Region::Fl_Complex_Region() :
 }
 
 /**
- * Create a complex region with the same bounds as the give rect.
- * @param r region size
+ Create a complex region with the same bounds as the give rect.
+ \param r region size
  */
 Fl_Complex_Region::Fl_Complex_Region(const Fl_Rect_Region &r) :
         Fl_Rect_Region(r)
@@ -209,7 +209,7 @@ Fl_Complex_Region::Fl_Complex_Region(const Fl_Rect_Region &r) :
 }
 
 /**
- * Delete this region, all subregions recursively, and all following regions.
+ Delete this region, all subregions recursively, and all following regions.
  */
 Fl_Complex_Region::~Fl_Complex_Region()
 {
@@ -217,12 +217,12 @@ Fl_Complex_Region::~Fl_Complex_Region()
 }
 
 /**
- * Delete all subregions of this region.
- * The pSubregion pointer should always be seen as a list of subregions, rather
- * than a single region and some pNext pointer. So everything we do, we should
- * probably do for every object in that list.
- *
- * Also note, that the top level region never has pNext pointing to anything.
+ Delete all subregions of this region.
+ The pSubregion pointer should always be seen as a list of subregions, rather
+ than a single region and some pNext pointer. So everything we do, we should
+ probably do for every object in that list.
+
+ Also note, that the top level region never has pNext pointing to anything.
  */
 void Fl_Complex_Region::delete_all_subregions()
 {
@@ -237,7 +237,7 @@ void Fl_Complex_Region::delete_all_subregions()
 }
 
 /**
- * Print the entire content of this region recursively.
+ Print the entire content of this region recursively.
  */
 void Fl_Complex_Region::print(const char *label) const
 {
@@ -246,7 +246,7 @@ void Fl_Complex_Region::print(const char *label) const
 }
 
 /*
- * Print the rectangular data only.
+ Print the rectangular data only.
  */
 void Fl_Complex_Region::print_data(int indent) const
 {
@@ -263,8 +263,8 @@ void Fl_Complex_Region::print_data(int indent) const
 }
 
 /**
- * Replace this region with a rectangle.
- * @param r the source rectangle
+ Replace this region with a rectangle.
+ \param r the source rectangle
  */
 void Fl_Complex_Region::set(const Fl_Rect_Region &r)
 {
@@ -273,9 +273,9 @@ void Fl_Complex_Region::set(const Fl_Rect_Region &r)
 }
 
 /**
- * Replace this region with a copy of another region.
- * This operation can be expensive for very complex regions.
- * @param r the source region
+ Replace this region with a copy of another region.
+ This operation can be expensive for very complex regions.
+ \param r the source region
  */
 void Fl_Complex_Region::set(const Fl_Complex_Region &r)
 {
@@ -298,9 +298,9 @@ void Fl_Complex_Region::set(const Fl_Complex_Region &r)
 }
 
 /**
- * Set this region to the intersection of the original region and some rect.
- * @param r intersect with this rectangle
- * @return EMPTY, SAME, LESS
+ Set this region to the intersection of the original region and some rect.
+ \param r intersect with this rectangle
+ \return EMPTY, SAME, LESS
  */
 int Fl_Complex_Region::intersect_with(const Fl_Rect_Region &r)
 {
@@ -318,9 +318,9 @@ int Fl_Complex_Region::intersect_with(const Fl_Rect_Region &r)
 }
 
 /**
- * Subtract a rectangular region from this region.
- * @param r the rect that we want removed
- * @return currently 0, but could return something meaningful
+ Subtract a rectangular region from this region.
+ \param r the rect that we want removed
+ \return currently 0, but could return something meaningful
  */
 int Fl_Complex_Region::subtract(const Fl_Rect_Region &r)
 {
@@ -356,10 +356,10 @@ int Fl_Complex_Region::subtract(const Fl_Rect_Region &r)
 }
 
 /**
- * Compress the subregion of this region if possible and update the bounding
- * box of this region.
- *
- * Does not recurse down the tree!
+ Compress the subregion of this region if possible and update the bounding
+ box of this region.
+
+ Does not recurse down the tree!
  */
 void Fl_Complex_Region::compress()
 {
@@ -401,10 +401,10 @@ void Fl_Complex_Region::compress()
 }
 
 /**
- * Subtract a smaller rect from a larger rect, potentially creating four new rectangles.
- * This assumes that the calling region is NOT complex.
- * @param r subtract the area of this rectangle; r must fit within ``this``.
- * @return currently 0, but this may change
+ Subtract a smaller rect from a larger rect, potentially creating four new rectangles.
+ This assumes that the calling region is NOT complex.
+ \param r subtract the area of this rectangle; r must fit within ``this``.
+ \return currently 0, but this may change
  */
 int Fl_Complex_Region::subtract_smaller_region(const Fl_Rect_Region &r)
 {
@@ -444,8 +444,8 @@ int Fl_Complex_Region::subtract_smaller_region(const Fl_Rect_Region &r)
 }
 
 /**
- * Add an empty subregion to the current region.
- * @return a pointer to the newly created region.
+ Add an empty subregion to the current region.
+ \return a pointer to the newly created region.
  */
 Fl_Complex_Region *Fl_Complex_Region::add_subregion()
 {
@@ -460,9 +460,9 @@ Fl_Complex_Region *Fl_Complex_Region::add_subregion()
 // -----------------------------------------------------------------------------
 
 /**
- * Returns an iterator object for loops that traverse the entire region tree.
- * C++11 interface to range-based loops.
- * @return Iterator pointing to the first element.
+ Returns an iterator object for loops that traverse the entire region tree.
+ C++11 interface to range-based loops.
+ \return Iterator pointing to the first element.
  */
 Fl_Complex_Region::Iterator Fl_Complex_Region::begin()
 {
@@ -470,9 +470,9 @@ Fl_Complex_Region::Iterator Fl_Complex_Region::begin()
 }
 
 /**
- * Returns an interator object to mark the end of travesing the tree.
- * C++11 interface to range-based loops.
- * @return
+ Returns an interator object to mark the end of travesing the tree.
+ C++11 interface to range-based loops.
+ \return
  */
 Fl_Complex_Region::Iterator Fl_Complex_Region::end()
 {
@@ -480,8 +480,8 @@ Fl_Complex_Region::Iterator Fl_Complex_Region::end()
 }
 
 /**
- * Create an iterator to walk the entire tree.
- * @param r Iterate through this region, r must not have a parent().
+ Create an iterator to walk the entire tree.
+ \param r Iterate through this region, r must not have a parent().
  */
 Fl_Complex_Region::Iterator::Iterator(Fl_Complex_Region *r) :
         pRegion(r)
@@ -489,10 +489,10 @@ Fl_Complex_Region::Iterator::Iterator(Fl_Complex_Region *r) :
 }
 
 /**
- * Compare two iterators.
- * C++11 needs this to find the end of a for loop.
- * @param other
- * @return
+ Compare two iterators.
+ C++11 needs this to find the end of a for loop.
+ \param other
+ \return
  */
 bool Fl_Complex_Region::Iterator::operator!=(const Iterator &other) const
 {
@@ -500,9 +500,9 @@ bool Fl_Complex_Region::Iterator::operator!=(const Iterator &other) const
 }
 
 /**
- * Set the iterator to the next object in the tree, down first.
- * C++11 needs this to iterate in a for loop.
- * @return
+ Set the iterator to the next object in the tree, down first.
+ C++11 needs this to iterate in a for loop.
+ \return
  */
 const Fl_Complex_Region::Iterator &Fl_Complex_Region::Iterator::operator++()
 {
@@ -517,8 +517,8 @@ const Fl_Complex_Region::Iterator &Fl_Complex_Region::Iterator::operator++()
 }
 
 /**
- * Return the current object while iterating through the tree.
- * @return
+ Return the current object while iterating through the tree.
+ \return
  */
 Fl_Complex_Region *Fl_Complex_Region::Iterator::operator*() const
 {
@@ -528,9 +528,9 @@ Fl_Complex_Region *Fl_Complex_Region::Iterator::operator*() const
 // -----------------------------------------------------------------------------
 
 /**
- * Use this to iterate through a region, hitting only nodes that intersect with this rect.
- * @param r find all parts of the region that intersect with this rect.
- * @return an object that can be used in range-based for loops in C++11.
+ Use this to iterate through a region, hitting only nodes that intersect with this rect.
+ \param r find all parts of the region that intersect with this rect.
+ \return an object that can be used in range-based for loops in C++11.
  */
 Fl_Complex_Region::Overlapping Fl_Complex_Region::overlapping(const Fl_Rect_Region &r)
 {
@@ -538,9 +538,9 @@ Fl_Complex_Region::Overlapping Fl_Complex_Region::overlapping(const Fl_Rect_Regi
 }
 
 /**
- * A helper object for iterating through a region, finding only overlapping rects.
- * @param rgn
- * @param rect
+ A helper object for iterating through a region, finding only overlapping rects.
+ \param rgn
+ \param rect
  */
 Fl_Complex_Region::Overlapping::Overlapping(Fl_Complex_Region *rgn,
                                             const Fl_Rect_Region &rect) :
@@ -551,8 +551,8 @@ Fl_Complex_Region::Overlapping::Overlapping(Fl_Complex_Region *rgn,
 }
 
 /**
- * Return an itertor for the first clipping rectangle inside the region.
- * @return
+ Return an itertor for the first clipping rectangle inside the region.
+ \return
  */
 Fl_Complex_Region::Overlapping::OverlappingIterator Fl_Complex_Region::Overlapping::begin()
 {
@@ -561,8 +561,8 @@ Fl_Complex_Region::Overlapping::OverlappingIterator Fl_Complex_Region::Overlappi
 }
 
 /**
- * Return an iterator for the end of forward iteration.
- * @return
+ Return an iterator for the end of forward iteration.
+ \return
  */
 Fl_Complex_Region::Overlapping::OverlappingIterator Fl_Complex_Region::Overlapping::end()
 {
@@ -570,8 +570,8 @@ Fl_Complex_Region::Overlapping::OverlappingIterator Fl_Complex_Region::Overlappi
 }
 
 /**
- * Return the result of intersecting the original rect with this iterator.
- * @return
+ Return the result of intersecting the original rect with this iterator.
+ \return
  */
 Fl_Rect_Region &Fl_Complex_Region::Overlapping::clipped_rect()
 {
@@ -579,8 +579,8 @@ Fl_Rect_Region &Fl_Complex_Region::Overlapping::clipped_rect()
 }
 
 /**
- * Store the intersection in pClippedRect and return true if there was an intersection.
- * @return
+ Store the intersection in pClippedRect and return true if there was an intersection.
+ \return
  */
 bool Fl_Complex_Region::Overlapping::intersects()
 {
@@ -588,9 +588,9 @@ bool Fl_Complex_Region::Overlapping::intersects()
 }
 
 /**
- * Find the next element in the tree that actually intersects with the initial rect.
- * Starting the search at the current object, NOT the next object.
- * @return
+ Find the next element in the tree that actually intersects with the initial rect.
+ Starting the search at the current object, NOT the next object.
+ \return
  */
 bool Fl_Complex_Region::Overlapping::find_intersecting()
 {
@@ -610,8 +610,8 @@ bool Fl_Complex_Region::Overlapping::find_intersecting()
 }
 
 /**
- * Find the next object in the tree, complex, simple, intersecting or not.
- * @return
+ Find the next object in the tree, complex, simple, intersecting or not.
+ \return
  */
 bool Fl_Complex_Region::Overlapping::find_next()
 {
@@ -628,9 +628,9 @@ bool Fl_Complex_Region::Overlapping::find_next()
 // -----------------------------------------------------------------------------
 
 /**
- * Create the actual iterator for finding true clipping rects.
- * @see Fl_Complex_Region::Overlapping
- * @param ov
+ Create the actual iterator for finding true clipping rects.
+ \see Fl_Complex_Region::Overlapping
+ \param ov
  */
 Fl_Complex_Region::Overlapping::OverlappingIterator::OverlappingIterator(
         Overlapping *ov) :
@@ -639,10 +639,10 @@ Fl_Complex_Region::Overlapping::OverlappingIterator::OverlappingIterator(
 }
 
 /**
- * Compare two iterator.
- * This is used by C++11 range-based for loops to find the end of the range.
- * @param other
- * @return
+ Compare two iterator.
+ This is used by C++11 range-based for loops to find the end of the range.
+ \param other
+ \return
  */
 bool Fl_Complex_Region::Overlapping::OverlappingIterator::operator!=(
         const OverlappingIterator &other) const
@@ -653,10 +653,10 @@ bool Fl_Complex_Region::Overlapping::OverlappingIterator::operator!=(
 }
 
 /**
- * Wrapper to find and set the next intersecting rectangle.
- * @see Fl_Complex_Region::Overlapping::find_intersecting
- * @see Fl_Complex_Region::Overlapping::find_next
- * @return
+ Wrapper to find and set the next intersecting rectangle.
+ \see Fl_Complex_Region::Overlapping::find_intersecting
+ \see Fl_Complex_Region::Overlapping::find_next
+ \return
  */
 const Fl_Complex_Region::Overlapping::OverlappingIterator &
 Fl_Complex_Region::Overlapping::OverlappingIterator::operator++()
@@ -668,10 +668,10 @@ Fl_Complex_Region::Overlapping::OverlappingIterator::operator++()
 }
 
 /**
- * Return the Fl_Complex_Region::Overlapping state for this iterator.
- * This gives the user access to the current rectangular fragment of
- * the clipping region.
- * @return
+ Return the Fl_Complex_Region::Overlapping state for this iterator.
+ This gives the user access to the current rectangular fragment of
+ the clipping region.
+ \return
  */
 Fl_Complex_Region::Overlapping *
 Fl_Complex_Region::Overlapping::OverlappingIterator::operator*() const
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
index b927d1aa2..db40dc729 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
@@ -32,8 +32,8 @@ extern int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg);
 static int sign(int v) { return (v<0) ? -1 : 1; }
 
 /*
- * By linking this module, the following static method will instantiate the
- * Windows GDI Graphics driver as the main display driver.
+ By linking this module, the following static method will instantiate the
+ Windows GDI Graphics driver as the main display driver.
  */
 Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
 {
@@ -42,7 +42,7 @@ Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
 
 
 /**
- * Private default constructor.
+ Private default constructor.
  */
 Fl_Android_Graphics_Driver::Fl_Android_Graphics_Driver() :
         super()
@@ -262,8 +262,8 @@ void Fl_Android_Graphics_Driver::line_style(int style, int width, char* dashes)
 }
 
 /**
- * Draw a single dot in the current color.
- * @param x, y position relative to window.
+ Draw a single dot in the current color.
+ \param x, y position relative to window.
  */
 void Fl_Android_Graphics_Driver::point(int x, int y)
 {
@@ -283,10 +283,10 @@ void Fl_Android_Graphics_Driver::point(int x, int y)
 }
 
 /**
- * Draw a line.
- * FIXME: it is incredibly inefficient to call 'point', especially for long lines
- * FIXME: clipping maust be moved into this call and drawing to the screen should happen right here
- * FIXME: line width is not considered
+ Draw a line.
+ FIXME: it is incredibly inefficient to call 'point', especially for long lines
+ FIXME: clipping maust be moved into this call and drawing to the screen should happen right here
+ FIXME: line width is not considered
  */
 void Fl_Android_Graphics_Driver::line(int x, int y, int x1, int y1)
 {
@@ -379,7 +379,7 @@ void Fl_Android_Graphics_Driver::polygon(int x0, int y0, int x1, int y1, int x2,
 
 
 /**
- * Reset the vertex counter to zero.
+ Reset the vertex counter to zero.
  */
 void Fl_Android_Graphics_Driver::begin_vertices()
 {
@@ -388,9 +388,9 @@ void Fl_Android_Graphics_Driver::begin_vertices()
 }
 
 /**
- * Add a vertex to the vertex list. Dynamically allocates memory.
- * @param x, y position of the vertex after matrix transformation
- * @param gap line and loop call offer to leave a gap in the drawing
+ Add a vertex to the vertex list. Dynamically allocates memory.
+ \param x, y position of the vertex after matrix transformation
+ \param gap line and loop call offer to leave a gap in the drawing
  */
 void Fl_Android_Graphics_Driver::add_vertex(float x, float y, bool gap)
 {
@@ -404,7 +404,7 @@ void Fl_Android_Graphics_Driver::add_vertex(float x, float y, bool gap)
 }
 
 /**
- * Start a list of vertices to draw multiple points.
+ Start a list of vertices to draw multiple points.
  */
 void Fl_Android_Graphics_Driver::begin_points()
 {
@@ -413,7 +413,7 @@ void Fl_Android_Graphics_Driver::begin_points()
 }
 
 /**
- * Start a list of vertices to draw a polyline.
+ Start a list of vertices to draw a polyline.
  */
 void Fl_Android_Graphics_Driver::begin_line()
 {
@@ -422,7 +422,7 @@ void Fl_Android_Graphics_Driver::begin_line()
 }
 
 /**
- * Start a list of vertices to draw a line loop.
+ Start a list of vertices to draw a line loop.
  */
 void Fl_Android_Graphics_Driver::begin_loop()
 {
@@ -431,7 +431,7 @@ void Fl_Android_Graphics_Driver::begin_loop()
 }
 
 /**
- * Start a list of vertices to draw a polygon.
+ Start a list of vertices to draw a polygon.
  */
 void Fl_Android_Graphics_Driver::begin_polygon()
 {
@@ -440,7 +440,7 @@ void Fl_Android_Graphics_Driver::begin_polygon()
 }
 
 /**
- * Start a list of vertices to draw a complex polygon.
+ Start a list of vertices to draw a complex polygon.
  */
 void Fl_Android_Graphics_Driver::begin_complex_polygon()
 {
@@ -449,7 +449,7 @@ void Fl_Android_Graphics_Driver::begin_complex_polygon()
 }
 
 /**
- * Draw all stored vertices as points.
+ Draw all stored vertices as points.
  */
 void Fl_Android_Graphics_Driver::end_points()
 {
@@ -461,7 +461,7 @@ void Fl_Android_Graphics_Driver::end_points()
 }
 
 /**
- * Draw all stored vertices as a polyline.
+ Draw all stored vertices as a polyline.
  */
 void Fl_Android_Graphics_Driver::end_line()
 {
@@ -475,7 +475,7 @@ void Fl_Android_Graphics_Driver::end_line()
 }
 
 /**
- * Draw all stored vertices as a polyline loop.
+ Draw all stored vertices as a polyline loop.
  */
 void Fl_Android_Graphics_Driver::end_loop()
 {
@@ -490,10 +490,10 @@ void Fl_Android_Graphics_Driver::end_loop()
 }
 
 /**
- * Draw all stored vertices as a polygon.
- * FIXME: these calls are very ineffiecient. Avoid pointer lookup.
- * FIXME: use the current clipping rect to accelerate rendering
- * FIXME: unmix float and int
+ Draw all stored vertices as a polygon.
+ FIXME: these calls are very ineffiecient. Avoid pointer lookup.
+ FIXME: use the current clipping rect to accelerate rendering
+ FIXME: unmix float and int
  */
 void Fl_Android_Graphics_Driver::end_polygon(int begin, int end)
 {
@@ -560,8 +560,8 @@ void Fl_Android_Graphics_Driver::end_polygon(int begin, int end)
 }
 
 /**
- * Draw all stored vertices as a polygon.
- * Mind the gap!
+ Draw all stored vertices as a polygon.
+ Mind the gap!
  */
 void Fl_Android_Graphics_Driver::end_polygon()
 {
@@ -579,10 +579,10 @@ void Fl_Android_Graphics_Driver::end_polygon()
 }
 
 /**
- * Draw all stored vertices as a possibly self-intersecting polygon.
- * FIXME: these calls are very ineffiecient. Avoid pointer lookup.
- * FIXME: use the current clipping rect to accelerate rendering
- * FIXME: unmix float and int
+ Draw all stored vertices as a possibly self-intersecting polygon.
+ FIXME: these calls are very ineffiecient. Avoid pointer lookup.
+ FIXME: use the current clipping rect to accelerate rendering
+ FIXME: unmix float and int
  */
 void Fl_Android_Graphics_Driver::end_complex_polygon()
 {
@@ -653,7 +653,7 @@ void Fl_Android_Graphics_Driver::end_complex_polygon()
 }
 
 /**
- * Add a gap to a polyline drawing
+ Add a gap to a polyline drawing
  */
 void Fl_Android_Graphics_Driver::gap()
 {
@@ -668,8 +668,8 @@ void Fl_Android_Graphics_Driver::gap()
 }
 
 /**
- * Add a vertex to the list.
- * TODO: we should maintain a bounding box for faster clipping.
+ Add a vertex to the list.
+ TODO: we should maintain a bounding box for faster clipping.
  */
 void Fl_Android_Graphics_Driver::transformed_vertex(double x, double y)
 {
@@ -684,14 +684,14 @@ void Fl_Android_Graphics_Driver::vertex(double x,double y)
 
 
 /**
- * Draw an arc.
- * @param xi
- * @param yi
- * @param w
- * @param h
- * @param a1
- * @param a2
- * FIXME: float-to-int interpolation is horrible!
+ Draw an arc.
+ \param xi
+ \param yi
+ \param w
+ \param h
+ \param a1
+ \param a2
+ FIXME: float-to-int interpolation is horrible!
  */
 void Fl_Android_Graphics_Driver::arc(int xi, int yi, int w, int h, double a1, double a2)
 {
@@ -722,14 +722,14 @@ void Fl_Android_Graphics_Driver::arc(int xi, int yi, int w, int h, double a1, do
 }
 
 /**
- * Draw a piece of a pie.
- * FIXME: this is not working very well at all.
- * @param xi
- * @param yi
- * @param w
- * @param h
- * @param b1
- * @param b2
+ Draw a piece of a pie.
+ FIXME: this is not working very well at all.
+ \param xi
+ \param yi
+ \param w
+ \param h
+ \param b1
+ \param b2
  */
 void Fl_Android_Graphics_Driver::pie(int xi, int yi, int w, int h, double b1, double b2)
 {
@@ -945,9 +945,9 @@ void Fl_Android_Graphics_Driver::pie(int xi, int yi, int w, int h, double b1, do
 }
 
 /**
- * FIXME: these do not draw rotated ellipses correctly!
- * FIXME: use floating point version of arc and pie?!
- * */
+ FIXME: these do not draw rotated ellipses correctly!
+ FIXME: use floating point version of arc and pie?!
+ */
 void Fl_Android_Graphics_Driver::ellipse(double xt, double yt, double rx, double ry)
 {
   int llx = xt-rx;
@@ -1128,10 +1128,10 @@ void Fl_Android_Graphics_Driver::draw_fixed(Fl_RGB_Image *img, int X, int Y, int
 
 
 /**
- * Copy RGB (or RGBA?) image data directly onto the surface.
- * TODO: I did not find documentation on the possible values of D. If D is four, does that
- * mean that the fourth value must be an alpha value, and should that be applied here?
- * What does a negative D indicate?
+ Copy RGB (or RGBA?) image data directly onto the surface.
+ TODO: I did not find documentation on the possible values of D. If D is four, does that
+ mean that the fourth value must be an alpha value, and should that be applied here?
+ What does a negative D indicate?
  */
 void Fl_Android_Graphics_Driver::draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L)
 {
@@ -1154,10 +1154,10 @@ void Fl_Android_Graphics_Driver::draw_image(const uchar* buf, int X,int Y,int W,
 }
 
 /**
- * Copy RGB (or RGBA?) image data directly onto the surface.
- * TODO: I did not find documentation on the possible values of D. If D is four, does that
- * mean that the fourth value must be an alpha value, and should that be applied here?
- * What does a negative D indicate?
+ Copy RGB (or RGBA?) image data directly onto the surface.
+ TODO: I did not find documentation on the possible values of D. If D is four, does that
+ mean that the fourth value must be an alpha value, and should that be applied here?
+ What does a negative D indicate?
  */
 void Fl_Android_Graphics_Driver::draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D, int L)
 {
@@ -1181,9 +1181,9 @@ void Fl_Android_Graphics_Driver::draw_image_mono(const uchar* buf, int X,int Y,i
 }
 
 /*
- * Draw some graphics line-by-line directly onto this surface
- * TODO: I did not find documentation on the possible values of D. If D is four, does that
- * mean that the fourth value must be an alpha value, and should that be applied here?
+ Draw some graphics line-by-line directly onto this surface
+ TODO: I did not find documentation on the possible values of D. If D is four, does that
+ mean that the fourth value must be an alpha value, and should that be applied here?
  */
 void Fl_Android_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D)
 {
@@ -1208,11 +1208,11 @@ void Fl_Android_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int
 }
 
 /*
- * Draw some graphics line-by-line directly onto this surface
- * TODO: I did not find documentation on the possible values of D. If D is two, does that
- * mean that the fourth value must be an alpha value, and should that be applied here?
- * If it is three, doe we need to convert RGB to grayscale?
- * What exactly does a negative value mean? Where is this all documented? Sigh.
+ Draw some graphics line-by-line directly onto this surface
+ TODO: I did not find documentation on the possible values of D. If D is two, does that
+ mean that the fourth value must be an alpha value, and should that be applied here?
+ If it is three, doe we need to convert RGB to grayscale?
+ What exactly does a negative value mean? Where is this all documented? Sigh.
  */
 void Fl_Android_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D)
 {
@@ -1259,9 +1259,9 @@ void Fl_Android_Graphics_Driver::color(uchar r, uchar g, uchar b)
 }
 
 /**
- * Draw a rectangle that may be dithered if we are in colormap mode (which in
- * the year 2018 is as likely has a user with a berstein colored tube TV).
- * FIXME: This function should be virtual as well, or should not exist at all.
+ Draw a rectangle that may be dithered if we are in colormap mode (which in
+ the year 2018 is as likely has a user with a berstein colored tube TV).
+ FIXME: This function should be virtual as well, or should not exist at all.
  */
 void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) {
 #if USE_COLORMAP
diff --git a/src/drivers/Android/Fl_Android_Graphics_Font.H b/src/drivers/Android/Fl_Android_Graphics_Font.H
index 358af6fa0..0f39700b3 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Font.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Font.H
@@ -32,10 +32,10 @@
 
 
 /**
- * A bytemap is an array of bytes, used as an alpha channel when redering glyphs
- * in a given color.
- * TODO: reate a class for RGB only and for grayscale and grayscale with alpha
- * TODO: derive all this from a baseclass, so we can create the correct class for the required image
+ A bytemap is an array of bytes, used as an alpha channel when redering glyphs
+ in a given color.
+ TODO: reate a class for RGB only and for grayscale and grayscale with alpha
+ TODO: derive all this from a baseclass, so we can create the correct class for the required image
  */
 class Fl_Android_Bytemap
 {
@@ -52,10 +52,10 @@ public:
 
 
 /**
- * A 565a map is an array of words for interleaved RGB and Alpha data.
- * 565 is the number of bit per component, compatible with our screen memory
- * scheme. The second word is actually a byt containing the alpha value for
- * the previous pixel: rrrrrggg.gggbbbbb.aaaaaaaa.00000000
+ A 565a map is an array of words for interleaved RGB and Alpha data.
+ 565 is the number of bit per component, compatible with our screen memory
+ scheme. The second word is actually a byt containing the alpha value for
+ the previous pixel: rrrrrggg.gggbbbbb.aaaaaaaa.00000000
  */
 class Fl_Android_565A_Map
 {
@@ -78,8 +78,8 @@ public:
 
 
 /**
- * This class reads True Type Font files and creates Bytemaps for glyphs at the
- * requested height.
+ This class reads True Type Font files and creates Bytemaps for glyphs at the
+ requested height.
  */
 class Fl_Android_Font_Source
 {
@@ -105,7 +105,7 @@ public:
 
 
 /**
- * This class caches glyphs of a font for a specified height.
+ This class caches glyphs of a font for a specified height.
  */
 class Fl_Android_Font_Descriptor : public Fl_Font_Descriptor
 {
diff --git a/src/drivers/Android/Fl_Android_Graphics_Font.cxx b/src/drivers/Android/Fl_Android_Graphics_Font.cxx
index f15a0c585..ac4a026c4 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Font.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Font.cxx
@@ -35,9 +35,9 @@
 
 
 /**
- * - font names starting with a $ will have the system font path inserted
- * - font names starting with an @ will be loaded via the Asset Manager
- * - all other names will be used verbatim
+ - font names starting with a $ will have the system font path inserted
+ - font names starting with an @ will be loaded via the Asset Manager
+ - all other names will be used verbatim
  */
 static Fl_Fontdesc built_in_table[] = {
         {"$Roboto-Regular.ttf"},
@@ -68,14 +68,14 @@ static const char *old_font_names[] = {
 // -----------------------------------------------------------------------------
 
 /**
- * Create an empty Bytemap.
+ Create an empty Bytemap.
  */
 Fl_Android_Bytemap::Fl_Android_Bytemap()
 {
 }
 
 /**
- * Create an empty Bytemap.
+ Create an empty Bytemap.
  */
 Fl_Android_Bytemap::Fl_Android_Bytemap(int w, int h)
 {
@@ -84,7 +84,7 @@ Fl_Android_Bytemap::Fl_Android_Bytemap(int w, int h)
 }
 
 /**
- * Destroy the Bytemap and its allocated resources.
+ Destroy the Bytemap and its allocated resources.
  */
 Fl_Android_Bytemap::~Fl_Android_Bytemap()
 {
@@ -92,14 +92,14 @@ Fl_Android_Bytemap::~Fl_Android_Bytemap()
 }
 
 /**
- * Render a bytemap to the screen using the current fl_color.
- *
- * Bytes are seen as alpha values for the RGB color set by fl_color. For better
- * performance, alpha is only rendered in 5 steps. All rendering is offset as
- * described in the bytemap, and clipped to the clipping region.
- * @param xx, yy bottom left position of the bytemap (baseline for text)
- * @param bm bytemap including offsets and size
- * @param r clipping rectangle
+ Render a bytemap to the screen using the current fl_color.
+
+ Bytes are seen as alpha values for the RGB color set by fl_color. For better
+ performance, alpha is only rendered in 5 steps. All rendering is offset as
+ described in the bytemap, and clipped to the clipping region.
+ \param xx, yy bottom left position of the bytemap (baseline for text)
+ \param bm bytemap including offsets and size
+ \param r clipping rectangle
  */
 void Fl_Android_Graphics_Driver::draw(int xx, int yy, Fl_Android_Bytemap *bm,
                                       Fl_Rect_Region &r)
@@ -160,8 +160,8 @@ void Fl_Android_Graphics_Driver::draw(int xx, int yy, Fl_Android_Bytemap *bm,
 // -----------------------------------------------------------------------------
 
 /**
- * Create an empty image.
- * All initialisation of members is done in-lin (C++11)
+ Create an empty image.
+ All initialisation of members is done in-lin (C++11)
  */
 Fl_Android_565A_Map::Fl_Android_565A_Map()
 {
@@ -179,14 +179,14 @@ Fl_Android_565A_Map::~Fl_Android_565A_Map()
 }
 
 /**
- * Render a bytemap to the screen using the current fl_color.
- *
- * Bytes are seen as alpha values for the RGB color set by fl_color. For better
- * performance, alpha is only rendered in 5 steps. All rendering is offset as
- * described in the bytemap, and clipped to the clipping region.
- * @param xx, yy bottom left position of the bytemap (baseline for text)
- * @param bm bytemap including offsets and size
- * @param r clipping rectangle
+ Render a bytemap to the screen using the current fl_color.
+
+ Bytes are seen as alpha values for the RGB color set by fl_color. For better
+ performance, alpha is only rendered in 5 steps. All rendering is offset as
+ described in the bytemap, and clipped to the clipping region.
+ \param xx, yy bottom left position of the bytemap (baseline for text)
+ \param bm bytemap including offsets and size
+ \param r clipping rectangle
  */
 void Fl_Android_Graphics_Driver::draw(int xx, int yy, Fl_Android_565A_Map *bm,
                                       Fl_Rect_Region &r)
@@ -233,9 +233,9 @@ void Fl_Android_Graphics_Driver::draw(int xx, int yy, Fl_Android_565A_Map *bm,
 // -----------------------------------------------------------------------------
 
 /**
- * Create a True Type font manager.
- * @param fname the name of the font as it appears in the fl_fonts table.
- * @param fnum the index into the fl_fonts table
+ Create a True Type font manager.
+ \param fname the name of the font as it appears in the fl_fonts table.
+ \param fnum the index into the fl_fonts table
  */
 Fl_Android_Font_Source::Fl_Android_Font_Source(const char *fname, Fl_Font fnum) :
         pFileBuffer(nullptr),
@@ -246,7 +246,7 @@ Fl_Android_Font_Source::Fl_Android_Font_Source(const char *fname, Fl_Font fnum)
 }
 
 /**
- * Release all resources.
+ Release all resources.
  */
 Fl_Android_Font_Source::~Fl_Android_Font_Source()
 {
@@ -255,9 +255,9 @@ Fl_Android_Font_Source::~Fl_Android_Font_Source()
 }
 
 /**
- * Attempt to find an load a font file.
- * @param name file or asset name
- * @return
+ Attempt to find an load a font file.
+ \param name file or asset name
+ \return
  */
 bool Fl_Android_Font_Source::load_font(const char *name)
 {
@@ -272,9 +272,9 @@ bool Fl_Android_Font_Source::load_font(const char *name)
 }
 
 /**
- * Attempt to load a font through the asset manager.
- * @param name file or asset name
- * @return
+ Attempt to load a font through the asset manager.
+ \param name file or asset name
+ \return
  */
 bool Fl_Android_Font_Source::load_font_asset(const char *name)
 {
@@ -307,9 +307,9 @@ bool Fl_Android_Font_Source::load_font_asset(const char *name)
 }
 
 /**
- * Attempt to load a font through the asset manager.
- * @param name file or asset name
- * @return
+ Attempt to load a font through the asset manager.
+ \param name file or asset name
+ \return
  */
 bool Fl_Android_Font_Source::load_font_file(const char *name)
 {
@@ -351,8 +351,8 @@ bool Fl_Android_Font_Source::load_font_file(const char *name)
 
 
 /**
- * Load a True Type font file and initialize the TTF interpreter.
- * A copy of the font file must remain in memory for the interpreter to work.
+ Load a True Type font file and initialize the TTF interpreter.
+ A copy of the font file must remain in memory for the interpreter to work.
  */
 void Fl_Android_Font_Source::load_font()
 {
@@ -382,10 +382,10 @@ void Fl_Android_Font_Source::load_font()
 }
 
 /**
- * Return a bytemap for the give unicode character.
- * @param c unicode character
- * @param size height in pixels
- * @return a bytemap
+ Return a bytemap for the give unicode character.
+ \param c unicode character
+ \param size height in pixels
+ \return a bytemap
  */
 Fl_Android_Bytemap *Fl_Android_Font_Source::get_bytemap(uint32_t c, int size)
 {
@@ -409,13 +409,13 @@ Fl_Android_Bytemap *Fl_Android_Font_Source::get_bytemap(uint32_t c, int size)
 }
 
 /**
- * Get the width of the character in pixels.
- * This is not a good function because character advance also depends on kerning
- * which takes the next character in a text line into account. Also, FLTK is
- * limited to integer character positions, and so is the Android driver.
- * @param c unicode character
- * @param size height in pixels
- * @return width in pixels to the start of the next character
+ Get the width of the character in pixels.
+ This is not a good function because character advance also depends on kerning
+ which takes the next character in a text line into account. Also, FLTK is
+ limited to integer character positions, and so is the Android driver.
+ \param c unicode character
+ \param size height in pixels
+ \return width in pixels to the start of the next character
  */
 float Fl_Android_Font_Source::get_advance(uint32_t c, Fl_Fontsize size)
 {
@@ -446,12 +446,12 @@ int Fl_Android_Font_Source::get_descent(Fl_Fontsize size)
 // -----------------------------------------------------------------------------
 
 /**
- * Create a new font descriptor.
- * @param fname name of this font as in fl_fonts
- * @param fsrc the font source for this font; there is one single font source
- *        for all hights of a single font
- * @param fnum index into the fl_fonts array
- * @param fsize height of font in pixels
+ Create a new font descriptor.
+ \param fname name of this font as in fl_fonts
+ \param fsrc the font source for this font; there is one single font source
+        for all hights of a single font
+ \param fnum index into the fl_fonts array
+ \param fsize height of font in pixels
  */
 Fl_Android_Font_Descriptor::Fl_Android_Font_Descriptor(const char *fname, Fl_Android_Font_Source *fsrc, Fl_Font fnum, Fl_Fontsize fsize) :
         Fl_Font_Descriptor(fname, fsize),
@@ -472,7 +472,7 @@ Fl_Android_Font_Descriptor::Fl_Android_Font_Descriptor(const char *fname, Fl_And
 }
 
 /**
- * Release resources, including all cached unicode character shapes.
+ Release resources, including all cached unicode character shapes.
  */
 Fl_Android_Font_Descriptor::~Fl_Android_Font_Descriptor()
 {
@@ -489,9 +489,9 @@ Fl_Android_Font_Descriptor::~Fl_Android_Font_Descriptor()
 }
 
 /*
- * Get the width of the character in pixels.
- * @param c unicode character
- * @return width in pixels to the start of the next character
+ Get the width of the character in pixels.
+ \param c unicode character
+ \return width in pixels to the start of the next character
  */
 float Fl_Android_Font_Descriptor::get_advance(uint32_t c)
 {
@@ -502,14 +502,14 @@ float Fl_Android_Font_Descriptor::get_advance(uint32_t c)
 }
 
 /**
- * Get the pixels for a given Unicode character.
- *
- * Calculating a bitmap is relatively expensive. This class will cache every
- * bitmap ever generated. Currently, this is pretty much brute force because
- * none of the bitmaps are ever released.
- *
- * @param c unicode character
- * @return a bytemap
+ Get the pixels for a given Unicode character.
+
+ Calculating a bitmap is relatively expensive. This class will cache every
+ bitmap ever generated. Currently, this is pretty much brute force because
+ none of the bitmaps are ever released.
+
+ \param c unicode character
+ \return a bytemap
  */
 Fl_Android_Bytemap *Fl_Android_Font_Descriptor::get_bytemap(uint32_t c)
 {
@@ -547,10 +547,10 @@ int Fl_Android_Font_Descriptor::get_descent()
 
 
 /**
- * Find or create a font descriptor for a given font and height.
- * @param fnum index into fl_fonts
- * @param size height in pixels
- * @return an existing oder newly created descriptor
+ Find or create a font descriptor for a given font and height.
+ \param fnum index into fl_fonts
+ \param size height in pixels
+ \return an existing oder newly created descriptor
  */
 Fl_Android_Font_Descriptor* Fl_Android_Font_Descriptor::find(Fl_Font fnum, Fl_Fontsize size)
 {
@@ -574,9 +574,9 @@ Fl_Android_Font_Descriptor* Fl_Android_Font_Descriptor::find(Fl_Font fnum, Fl_Fo
 // =============================================================================
 
 /**
- * Set a font for future use in text rendering calls.
- * @param fnum index into fl_fonts
- * @param size height in pixels
+ Set a font for future use in text rendering calls.
+ \param fnum index into fl_fonts
+ \param size height in pixels
  */
 void Fl_Android_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) {
   font_descriptor( Fl_Android_Font_Descriptor::find(fnum, size) );
@@ -585,10 +585,10 @@ void Fl_Android_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) {
 }
 
 /**
- * Copy a single letter to the screen.
- * @param xx, yy position of character on screen
- * @param c unicode character
- * @return x position of next character on screen
+ Copy a single letter to the screen.
+ \param xx, yy position of character on screen
+ \param c unicode character
+ \return x position of next character on screen
  */
 int Fl_Android_Graphics_Driver::render_letter(int xx, int yy, uint32_t c, Fl_Rect_Region &r)
 {
@@ -607,10 +607,10 @@ int Fl_Android_Graphics_Driver::render_letter(int xx, int yy, uint32_t c, Fl_Rec
 }
 
 /**
- * Render a string to screen.
- * @param str text in utf-8 encoding
- * @param n number of bytes to render
- * @param x, y position on screen
+ Render a string to screen.
+ \param str text in utf-8 encoding
+ \param n number of bytes to render
+ \param x, y position on screen
  */
 void Fl_Android_Graphics_Driver::draw(const char* str, int n, int x, int y)
 {
@@ -676,7 +676,7 @@ Fl_Fontsize Fl_Android_Graphics_Driver::size()
 }
 
 /**
- * FIXME: use the actual size of all glyphs, which is easily found in the Bytemap!
+ FIXME: use the actual size of all glyphs, which is easily found in the Bytemap!
  */
 void Fl_Android_Graphics_Driver::text_extents(const char *str, int n, int &dx, int &dy, int &w, int &h)
 {
@@ -705,10 +705,10 @@ int Fl_Android_Graphics_Driver::descent()
 }
 
 /**
- * Get a human-readable string describing the family of this face.
- * @param fnum index into font table
- * @param ap[out] returns if the face is bold or italic or both.
- * @return pointer to a string; don't free, don't write
+ Get a human-readable string describing the family of this face.
+ \param fnum index into font table
+ \param ap[out] returns if the face is bold or italic or both.
+ \return pointer to a string; don't free, don't write
  */
 const char *Fl_Android_Graphics_Driver::get_font_name(Fl_Font fnum, int* ap)
 {
@@ -723,9 +723,9 @@ const char *Fl_Android_Graphics_Driver::get_font_name(Fl_Font fnum, int* ap)
 }
 
 /**
- * Gets the string for this face.
- * @param num index into font table
- * @return pointer to a string; don't free, don't write
+ Gets the string for this face.
+ \param num index into font table
+ \return pointer to a string; don't free, don't write
  */
 const char *Fl_Android_Graphics_Driver::font_name(int num)
 {
@@ -735,11 +735,11 @@ const char *Fl_Android_Graphics_Driver::font_name(int num)
 }
 
 /**
- * Return an array of sizes in sizep.
- * @param fnum index into font table
- * @param sizep[out] a static array that contains the single value 0, indicating
- *        that all fonts are arbitrarily resizable.
- * @return 1, because our array has a size of 1
+ Return an array of sizes in sizep.
+ \param fnum index into font table
+ \param sizep[out] a static array that contains the single value 0, indicating
+        that all fonts are arbitrarily resizable.
+ \return 1, because our array has a size of 1
  */
 int Fl_Android_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep)
 {
@@ -749,10 +749,10 @@ int Fl_Android_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep)
 }
 
 /**
- * FLTK will open the display, and add every fonts on the server to the face table.
- * TODO: This is not supported under Android.
- * @param name basically a wildcard for finding fonts
- * @return number of fonts found
+ FLTK will open the display, and add every fonts on the server to the face table.
+ TODO: This is not supported under Android.
+ \param name basically a wildcard for finding fonts
+ \return number of fonts found
  */
 Fl_Font Fl_Android_Graphics_Driver::set_fonts(const char *name)
 {
@@ -760,11 +760,11 @@ Fl_Font Fl_Android_Graphics_Driver::set_fonts(const char *name)
 }
 
 /**
- * Changes a face.
- * @param num index of the font
- * @param name Path to font file, prepend $ for system fonts, @ for font assets.
- *        The string pointer is simply stored, the string is not copied, so the
- *        string must be in static memory.
+ Changes a face.
+ \param num index of the font
+ \param name Path to font file, prepend $ for system fonts, @ for font assets.
+        The string pointer is simply stored, the string is not copied, so the
+        string must be in static memory.
  */
 void Fl_Android_Graphics_Driver::font_name(int num, const char *name)
 {
diff --git a/src/drivers/Android/Fl_Android_Screen_Driver.cxx b/src/drivers/Android/Fl_Android_Screen_Driver.cxx
index 164c70bf1..ef6957382 100644
--- a/src/drivers/Android/Fl_Android_Screen_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Screen_Driver.cxx
@@ -18,9 +18,9 @@
 
 
 /**
- * @if AndroidDev
- * @defgroup AndroidDeveloper Android Developer Documentation
- * @{
+ @cond AndroidDev
+ \defgroup AndroidDeveloper Android Developer Documentation
+ \{
  */
 
 
@@ -39,11 +39,11 @@
 
 
 /**
- * @class Fl_Android_Screen_Driver
- *
- * Handle Android screen devices.
- *
- * @todo This class is in an early development stage
+ \class Fl_Android_Screen_Driver
+
+ Handle Android screen devices.
+
+ \todo This class is in an early development stage
  */
 
 
@@ -55,7 +55,7 @@ static void timer_do_callback(int timerIndex);
 
 
 /**
- * Creates a driver that manages all Android screen and display related calls.
+ Creates a driver that manages all Android screen and display related calls.
  */
 Fl_Screen_Driver *Fl_Screen_Driver::newScreenDriver()
 {
@@ -67,7 +67,7 @@ extern int fl_send_system_handlers(void *e);
 
 
 /**
- * Create the screen driver.
+ Create the screen driver.
  */
 Fl_Android_Screen_Driver::Fl_Android_Screen_Driver() :
   super(),
@@ -78,11 +78,11 @@ Fl_Android_Screen_Driver::Fl_Android_Screen_Driver() :
 
 
 /**
- * Call the FLTK System handler with Android specific events.
- *
- * @return always 1, assuming the event was handled
- *
- * @see Fl_Android_Platform_Event
+ Call the FLTK System handler with Android specific events.
+
+ \return always 1, assuming the event was handled
+
+ \see Fl_Android_Platform_Event
  */
 int Fl_Android_Screen_Driver::handle_app_command()
 {
@@ -187,12 +187,12 @@ int Fl_Android_Screen_Driver::handle_mouse_event(AInputQueue *queue, AInputEvent
 
 
 /**
- * Handle all events in the even queue.
- *
- * @todo what should this function return?
- *
- * @param time_to_wait
- * @return we do not know
+ Handle all events in the even queue.
+
+ \todo what should this function return?
+
+ \param time_to_wait
+ \return we do not know
  */
 int Fl_Android_Screen_Driver::handle_queued_events(double time_to_wait)
 {
@@ -253,13 +253,13 @@ int Fl_Android_Screen_Driver::handle_queued_events(double time_to_wait)
 
 
 /**
- * Wait for a maximum of `time_to_wait` until something happens.
- *
- * @param time_to_wait in seconds
- * @return We really do not know; check other platforms to see what is
- *        consistent here.
- *
- * @todo return the remaining time to reach 'time_to_wait'
+ Wait for a maximum of `time_to_wait` until something happens.
+
+ \param time_to_wait in seconds
+ \return We really do not know; check other platforms to see what is
+        consistent here.
+
+ \todo return the remaining time to reach 'time_to_wait'
  */
 double Fl_Android_Screen_Driver::wait(double time_to_wait)
 {
@@ -310,10 +310,10 @@ double Fl_Android_Screen_Driver::wait(double time_to_wait)
 
 
 /**
- * On Android, we currently write into a memory buffer and copy
- * the content to the screen.
- *
- * @see fl_flush()
+ On Android, we currently write into a memory buffer and copy
+ the content to the screen.
+
+ \see fl_flush()
  */
 void Fl_Android_Screen_Driver::flush()
 {
@@ -474,14 +474,14 @@ void Fl_Android_Screen_Driver::remove_timeout(Fl_Timeout_Handler cb, void *data)
 
 
 /**
- * Play some system sound.
- *
- * This function plays some rather arbitrary system sounds.
- *
- * @param type
- *
- * @see Fl_Screen_Driver::beep(int)
- * @see fl_beep(int)
+ Play some system sound.
+
+ This function plays some rather arbitrary system sounds.
+
+ \param type
+
+ \see Fl_Screen_Driver::beep(int)
+ \see fl_beep(int)
  */
 void Fl_Android_Screen_Driver::beep(int type)
 {
@@ -526,20 +526,20 @@ void Fl_Android_Screen_Driver::beep(int type)
 
 
 /**
- * Get the current mouse coordinates.
- *
- * This is used, among other things, to position the FLTK standard dialogs in
- * a way that makes it easy to click the most common button. For an Android
- * touch screen, this makes no sense at all, which is why we return the center
- * of the screen for now.
- *
- * @todo rethink the dialog positioning scheme for touch devices.
- *
- * @todo this method assumes a fixed screen resolution
- *
- * @param [out] x
- * @param [out] y
- * @return
+ Get the current mouse coordinates.
+
+ This is used, among other things, to position the FLTK standard dialogs in
+ a way that makes it easy to click the most common button. For an Android
+ touch screen, this makes no sense at all, which is why we return the center
+ of the screen for now.
+
+ \todo rethink the dialog positioning scheme for touch devices.
+
+ \todo this method assumes a fixed screen resolution
+
+ \param [out] x
+ \param [out] y
+ \return
  */
 int Fl_Android_Screen_Driver::get_mouse(int &x, int &y)
 {
@@ -565,8 +565,8 @@ void Fl_Android_Screen_Driver::grab(Fl_Window* win)
 
 
 /**
- * @}
- * @endif
+ \}
+ \endcond
  */
 
 
diff --git a/src/drivers/Android/Fl_Android_Window_Driver.cxx b/src/drivers/Android/Fl_Android_Window_Driver.cxx
index 364e0b62f..7cd4b34f9 100644
--- a/src/drivers/Android/Fl_Android_Window_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Window_Driver.cxx
@@ -163,10 +163,10 @@ void Fl_Android_Window_Driver::resize(int X,int Y,int W,int H)
 }
 
 /**
- * Scroll a portion of the window.
- * FIXME: We are currently taking the easy way out, basically telling the caller that we don;t know how to scroll
- * and asking FLTK to draw the new area from scratch. It would be nice if clipping provides all calls
- * that we need to implement a more efficient scrolling code.
+ Scroll a portion of the window.
+ FIXME: We are currently taking the easy way out, basically telling the caller that we don;t know how to scroll
+ and asking FLTK to draw the new area from scratch. It would be nice if clipping provides all calls
+ that we need to implement a more efficient scrolling code.
  */
 int Fl_Android_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y,
                                     void (*draw_area)(void*, int,int,int,int), void* data)