More trailing whilespace removal

24 files changed, 135 insertions, 135 deletions

diff --git a/NxWidgets/nxwm/COPYING b/NxWidgets/nxwm/COPYING
index 4273aec03..0f9a9db15 100644
--- a/NxWidgets/nxwm/COPYING
+++ b/NxWidgets/nxwm/COPYING
@@ -7,14 +7,14 @@ described in license (below).  Please feel free to contact me if you
 have any licensing concerns.
 
 /*************************************************************************
- * 
+ *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions 
+ * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ -28,13 +28,13 @@ have any licensing concerns.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
index 46e4e90d2..64e9e907c 100644
--- a/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "cnxtkwindow.hxx"
diff --git a/NxWidgets/nxwm/include/cfullscreenwindow.hxx b/NxWidgets/nxwm/include/cfullscreenwindow.hxx
index 70da9fee5..992d49789 100644
--- a/NxWidgets/nxwm/include/cfullscreenwindow.hxx
+++ b/NxWidgets/nxwm/include/cfullscreenwindow.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "cnxwindow.hxx"
diff --git a/NxWidgets/nxwm/include/chexcalculator.hxx b/NxWidgets/nxwm/include/chexcalculator.hxx
index 69ee37624..fc5de07b6 100644
--- a/NxWidgets/nxwm/include/chexcalculator.hxx
+++ b/NxWidgets/nxwm/include/chexcalculator.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
diff --git a/NxWidgets/nxwm/include/ckeyboard.hxx b/NxWidgets/nxwm/include/ckeyboard.hxx
index 8f16bd506..7036472fb 100644
--- a/NxWidgets/nxwm/include/ckeyboard.hxx
+++ b/NxWidgets/nxwm/include/ckeyboard.hxx
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
- 
+
 #ifndef __INCLUDE_CKEYBOARD_HXX
 #define __INCLUDE_CKEYBOARD_HXX
 
diff --git a/NxWidgets/nxwm/include/cmediaplayer.hxx b/NxWidgets/nxwm/include/cmediaplayer.hxx
index 81656c761..11ed3a0c1 100644
--- a/NxWidgets/nxwm/include/cmediaplayer.hxx
+++ b/NxWidgets/nxwm/include/cmediaplayer.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx
index f33f1182d..52fee386a 100644
--- a/NxWidgets/nxwm/include/cnxconsole.hxx
+++ b/NxWidgets/nxwm/include/cnxconsole.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx
index 250d5068c..e7337ead6 100644
--- a/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/NxWidgets/nxwm/include/cstartwindow.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <debug.h>
@@ -91,7 +91,7 @@ namespace NxWM
    */
 
   extern FAR const char *g_startWindowMqName;
-  
+
   /**
    * This class is the the start window application.
    */
@@ -104,7 +104,7 @@ namespace NxWM
     /**
      * This structure represents an application and its associated icon image
      */
- 
+
     struct SStartWindowSlot
     {
       IApplicationFactory            *app;      /**< A reference to the icon */
diff --git a/NxWidgets/nxwm/include/ctouchscreen.hxx b/NxWidgets/nxwm/include/ctouchscreen.hxx
index 396400204..c40fcb12c 100644
--- a/NxWidgets/nxwm/include/ctouchscreen.hxx
+++ b/NxWidgets/nxwm/include/ctouchscreen.hxx
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
- 
+
 #ifndef __INCLUDE_CTOUCHSCREEN_HXX
 #define __INCLUDE_CTOUCHSCREEN_HXX
 
@@ -162,7 +162,7 @@ namespace NxWM
     {
       // Set the capture flag.  m_calibrated must also be set to get to normal
       // mode where touchscreen data is forwarded to NX.
- 
+
       m_enabled = enable;
     }
 
diff --git a/NxWidgets/nxwm/include/iapplication.hxx b/NxWidgets/nxwm/include/iapplication.hxx
index 456202c6d..882c5e6ea 100644
--- a/NxWidgets/nxwm/include/iapplication.hxx
+++ b/NxWidgets/nxwm/include/iapplication.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "cnxstring.hxx"
diff --git a/NxWidgets/nxwm/include/iapplicationwindow.hxx b/NxWidgets/nxwm/include/iapplicationwindow.hxx
index 60f1b332c..733cb72b2 100644
--- a/NxWidgets/nxwm/include/iapplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/iapplicationwindow.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "inxwindow.hxx"
@@ -92,7 +92,7 @@ namespace NxWM
    * may be a contained, framed window or and unframed, fullscreen window.
    */
 
-  class IApplicationWindow 
+  class IApplicationWindow
   {
   public:
     /**
diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx
index 799ca61b6..523130349 100644
--- a/NxWidgets/nxwm/include/nxwmglyphs.hxx
+++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx
@@ -39,7 +39,7 @@
 /****************************************************************************
  * Included Files
  ****************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "nxconfig.hxx"
diff --git a/NxWidgets/nxwm/src/chexcalculator.cxx b/NxWidgets/nxwm/src/chexcalculator.cxx
index eeb0b1d1d..dc42de0c0 100644
--- a/NxWidgets/nxwm/src/chexcalculator.cxx
+++ b/NxWidgets/nxwm/src/chexcalculator.cxx
@@ -92,9 +92,9 @@ namespace NxWM
     KEY_PLUS,        // Additions
 
     // Special operations
- 
+
     KEY_EQUAL,       // Equal/Enter key
- 
+
     KEY_DECIMAL,     // Decimal mode
     KEY_HEXADECIMAL, // Hexadecimal mode
 
@@ -247,7 +247,7 @@ CHexCalculator::CHexCalculator(CTaskbar *taskbar, CApplicationWindow *window)
 
 CHexCalculator::~CHexCalculator(void)
 {
-  // Destroy widgets 
+  // Destroy widgets
 
   if (m_text)
     {
@@ -598,7 +598,7 @@ void CHexCalculator::labelKeypad(void)
             {
               label = "";
             }
-          
+
           // Set the text in the label
 
           m_keypad->setText(i, j, label);
@@ -848,7 +848,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
             break;
 
           // Special operations
- 
+
           case KEY_EQUAL:       // Equal/Enter key
             {
               // Is there a high precedence operation?
@@ -877,7 +877,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
               result = true;
             }
             break;
- 
+
           case KEY_DECIMAL:     // Decimal mode
             {
               if (m_hexMode)
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index 3a506cb4b..e78e91631 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -311,7 +311,7 @@ void CNxConsole::stop(void)
       // Calling task_delete() will also invoke the on_exit() handler.  We se
       // m_pid = -1 before calling task_delete() to let the on_exit() handler,
       // CNxConsole::exitHandler(), know that it should not do anything
- 
+
       pid_t pid = m_pid;
       m_pid = -1;
 
@@ -319,7 +319,7 @@ void CNxConsole::stop(void)
 
       task_delete(pid);
     }
- 
+
   // Destroy the NX console device
 
   if (m_nxcon)
diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx
index 8bf570f74..f05f29ebd 100644
--- a/NxWidgets/nxwm/src/ctouchscreen.cxx
+++ b/NxWidgets/nxwm/src/ctouchscreen.cxx
@@ -108,7 +108,7 @@ CTouchscreen::CTouchscreen(NXWidgets::CNxServer *server, struct nxgl_size_s *win
   // Use the default touch data buffer
 
   m_touch       = &m_sample;
-  
+
   // Initialize the m_waitSem semaphore so that any waits for data will block
 
   sem_init(&m_waitSem, 0, 0);
@@ -138,7 +138,7 @@ CTouchscreen::~CTouchscreen(void)
     }
 
    // Destroy the semaphores that we created.
- 
+
    sem_destroy(&m_waitSem);
 }
 
@@ -209,10 +209,10 @@ void CTouchscreen::setCalibrationData(const struct SCalibrationData &caldata)
   // Save a copy of the calibration data
 
   m_calibData = caldata;
- 
+
   // Note that we have calibration data.  Data will now be scaled and forwarded
   // to NX (unless we are still in cpature mode)
- 
+
    m_calibrated = true;
 
   // Wake up the listener thread so that it will use our buffer
diff --git a/NxWidgets/nxwm/src/glyph_calculator.cxx b/NxWidgets/nxwm/src/glyph_calculator.cxx
index 9bb3f690d..e8f5376d3 100644
--- a/NxWidgets/nxwm/src/glyph_calculator.cxx
+++ b/NxWidgets/nxwm/src/glyph_calculator.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -181,7 +181,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
   CONFIG_NXWIDGETS_BPP,     // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,     // fmt    - Color format
   BITMAP_NLUTCODES,         // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,          // width  - Width in pixels 
+  BITMAP_NCOLUMNS,          // width  - Width in pixels
   BITMAP_NROWS,             // height - Height in rows
   {                         // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_calculatorNormalLut,  //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_calibration.cxx b/NxWidgets/nxwm/src/glyph_calibration.cxx
index df169f556..3a9a30806 100644
--- a/NxWidgets/nxwm/src/glyph_calibration.cxx
+++ b/NxWidgets/nxwm/src/glyph_calibration.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -188,7 +188,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
   CONFIG_NXWIDGETS_BPP,       // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,       // fmt    - Color format
   BITMAP_NLUTCODES,           // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,            // width  - Width in pixels 
+  BITMAP_NCOLUMNS,            // width  - Width in pixels
   BITMAP_NROWS,               // height - Height in rows
   {                           // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_calibrationNormalLut,   //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_cmd.cxx b/NxWidgets/nxwm/src/glyph_cmd.cxx
index 373d8ad5e..cc8b8dca3 100644
--- a/NxWidgets/nxwm/src/glyph_cmd.cxx
+++ b/NxWidgets/nxwm/src/glyph_cmd.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -171,7 +171,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_cmdNormalLut,      //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx
index 31feb268f..bf228e0b2 100644
--- a/NxWidgets/nxwm/src/glyph_minimize.cxx
+++ b/NxWidgets/nxwm/src/glyph_minimize.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -169,7 +169,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_minimizeNormalLut, //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
index 011f892a2..38da35844 100644
--- a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
+++ b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
@@ -70,14 +70,14 @@ using namespace NxWM;
 
 static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
 {
-  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250), 
-  MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207), 
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250),
+  MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207),
 };
 
 static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
 {
-  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), 
-  MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255), 
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255),
+  MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255),
 };
 
 /* Bitmap definition for the "Play" button */
@@ -93,35 +93,35 @@ static const NXWidgets::SRlePaletteBitmapEntry play_bitmap[] =
   {  5,   0}, {  6,   3}, {  9,   6}, {  7,   3}, {  5,   0},              /* Row 6 */
   {  4,   0}, {  1,   2}, { 22,   3}, {  1,   2}, {  4,   0},              /* Row 7 */
   {  3,   0}, {  1,   5}, { 23,   3}, {  1,   2}, {  1,   5}, {  3,   0},  /* Row 8 */
-  {  3,   0}, {  3,   2}, {  5,   3}, {  1,   6}, { 13,   3}, {  4,   2}, 
+  {  3,   0}, {  3,   2}, {  5,   3}, {  1,   6}, { 13,   3}, {  4,   2},
   {  3,   0},                                                              /* Row 9 */
-  {  2,   0}, {  1,   5}, {  6,   2}, {  2,   3}, {  2,   4}, {  1,   6}, 
+  {  2,   0}, {  1,   5}, {  6,   2}, {  2,   3}, {  2,   4}, {  1,   6},
   {  9,   3}, {  6,   2}, {  1,   5}, {  2,   0},                          /* Row 10 */
-  {  2,   0}, {  1,   5}, {  8,   2}, {  1,   7}, {  3,   4}, {  1,   6}, 
+  {  2,   0}, {  1,   5}, {  8,   2}, {  1,   7}, {  3,   4}, {  1,   6},
   {  2,   2}, {  1,   3}, { 10,   2}, {  1,   5}, {  2,   0},              /* Row 11 */
-  {  1,   0}, {  4,   5}, {  6,   2}, {  1,   7}, {  4,   4}, {  1,   7}, 
+  {  1,   0}, {  4,   5}, {  6,   2}, {  1,   7}, {  4,   4}, {  1,   7},
   {  1,   3}, {  8,   2}, {  4,   5}, {  2,   0},                          /* Row 12 */
-  {  1,   0}, {  7,   5}, {  3,   2}, {  1,   7}, {  6,   4}, {  1,   7}, 
+  {  1,   0}, {  7,   5}, {  3,   2}, {  1,   7}, {  6,   4}, {  1,   7},
   {  3,   2}, {  8,   5}, {  2,   0},                                      /* Row 13 */
-  {  1,   0}, {  9,   5}, {  1,   2}, {  1,   7}, {  8,   4}, {  1,   7}, 
+  {  1,   0}, {  9,   5}, {  1,   2}, {  1,   7}, {  8,   4}, {  1,   7},
   {  8,   5}, {  1,   1}, {  1,   5}, {  1,   0},                          /* Row 14 */
-  {  1,   0}, {  4,   1}, {  6,   5}, {  1,   7}, { 10,   4}, {  1,   7}, 
+  {  1,   0}, {  4,   1}, {  6,   5}, {  1,   7}, { 10,   4}, {  1,   7},
   {  3,   5}, {  4,   1}, {  1,   5}, {  1,   0},                          /* Row 15 */
-  {  1,   0}, {  8,   1}, {  2,   5}, {  1,   7}, { 10,   4}, {  1,   7}, 
+  {  1,   0}, {  8,   1}, {  2,   5}, {  1,   7}, { 10,   4}, {  1,   7},
   {  7,   1}, {  1,   5}, {  1,   0},                                      /* Row 16 */
-  {  1,   0}, { 10,   1}, {  1,   7}, {  9,   4}, {  1,   5}, {  8,   1}, 
+  {  1,   0}, { 10,   1}, {  1,   7}, {  9,   4}, {  1,   5}, {  8,   1},
   {  1,   5}, {  1,   0},                                                  /* Row 17 */
-  {  1,   0}, { 10,   1}, {  1,   7}, {  7,   4}, {  1,   5}, { 10,   1}, 
+  {  1,   0}, { 10,   1}, {  1,   7}, {  7,   4}, {  1,   5}, { 10,   1},
   {  2,   0},                                                              /* Row 18 */
-  {  1,   0}, {  1,   5}, {  9,   1}, {  1,   7}, {  5,   4}, {  1,   7}, 
+  {  1,   0}, {  1,   5}, {  9,   1}, {  1,   7}, {  5,   4}, {  1,   7},
   { 12,   1}, {  2,   0},                                                  /* Row 19 */
-  {  2,   0}, {  9,   1}, {  1,   7}, {  4,   4}, {  1,   5}, { 13,   1}, 
+  {  2,   0}, {  9,   1}, {  1,   7}, {  4,   4}, {  1,   5}, { 13,   1},
   {  2,   0},                                                              /* Row 20 */
-  {  2,   0}, {  9,   1}, {  1,   7}, {  2,   4}, {  1,   7}, {  1,   2}, 
+  {  2,   0}, {  9,   1}, {  1,   7}, {  2,   4}, {  1,   7}, {  1,   2},
   { 13,   1}, {  1,   5}, {  2,   0},                                      /* Row 21 */
-  {  2,   0}, {  1,   5}, {  8,   1}, {  1,   7}, {  1,   4}, {  1,   5}, 
+  {  2,   0}, {  1,   5}, {  8,   1}, {  1,   7}, {  1,   4}, {  1,   5},
   {  6,   2}, {  9,   1}, {  3,   0},                                      /* Row 22 */
-  {  3,   0}, {  7,   1}, {  1,   2}, {  1,   5}, { 10,   2}, {  6,   1}, 
+  {  3,   0}, {  7,   1}, {  1,   2}, {  1,   5}, { 10,   2}, {  6,   1},
   {  1,   5}, {  3,   0},                                                  /* Row 23 */
   {  4,   0}, {  4,   1}, { 16,   2}, {  4,   1}, {  4,   0},              /* Row 24 */
   {  4,   0}, {  1,   5}, {  2,   1}, { 18,   2}, {  2,   1}, {  5,   0},  /* Row 25 */
@@ -158,45 +158,45 @@ static const NXWidgets::SRlePaletteBitmapEntry pause_bitmap[] =
   {  4,   0}, {  1,   2}, { 22,   3}, {  1,   2}, {  4,   0},              /* Row 7 */
   {  3,   0}, {  1,   5}, { 23,   3}, {  1,   2}, {  1,   5}, {  3,   0},  /* Row 8 */
   {  3,   0}, {  3,   2}, { 19,   3}, {  4,   2}, {  3,   0},              /* Row 9 */
-  {  2,   0}, {  1,   5}, {  5,   2}, {  2,   3}, {  1,   6}, {  3,   4}, 
-  {  3,   3}, {  1,   7}, {  2,   4}, {  1,   7}, {  2,   3}, {  6,   2}, 
+  {  2,   0}, {  1,   5}, {  5,   2}, {  2,   3}, {  1,   6}, {  3,   4},
+  {  3,   3}, {  1,   7}, {  2,   4}, {  1,   7}, {  2,   3}, {  6,   2},
   {  1,   5}, {  2,   0},                                                  /* Row 10 */
-  {  2,   0}, {  1,   5}, {  7,   2}, {  1,   7}, {  3,   4}, {  1,   7}, 
-  {  1,   2}, {  1,   3}, {  4,   4}, {  1,   3}, {  7,   2}, {  1,   5}, 
+  {  2,   0}, {  1,   5}, {  7,   2}, {  1,   7}, {  3,   4}, {  1,   7},
+  {  1,   2}, {  1,   3}, {  4,   4}, {  1,   3}, {  7,   2}, {  1,   5},
   {  2,   0},                                                              /* Row 11 */
-  {  1,   0}, {  4,   5}, {  5,   2}, {  1,   7}, {  3,   4}, {  1,   7}, 
-  {  1,   2}, {  1,   3}, {  4,   4}, {  1,   6}, {  4,   2}, {  4,   5}, 
+  {  1,   0}, {  4,   5}, {  5,   2}, {  1,   7}, {  3,   4}, {  1,   7},
+  {  1,   2}, {  1,   3}, {  4,   4}, {  1,   6}, {  4,   2}, {  4,   5},
   {  2,   0},                                                              /* Row 12 */
-  {  1,   0}, {  8,   5}, {  1,   2}, {  1,   7}, {  3,   4}, {  1,   7}, 
-  {  1,   2}, {  1,   5}, {  4,   4}, {  1,   5}, {  1,   2}, {  7,   5}, 
+  {  1,   0}, {  8,   5}, {  1,   2}, {  1,   7}, {  3,   4}, {  1,   7},
+  {  1,   2}, {  1,   5}, {  4,   4}, {  1,   5}, {  1,   2}, {  7,   5},
   {  2,   0},                                                              /* Row 13 */
-  {  1,   0}, {  9,   5}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   2}, 
+  {  1,   0}, {  9,   5}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   2},
   {  1,   5}, {  4,   4}, {  8,   5}, {  1,   1}, {  1,   5}, {  1,   0},  /* Row 14 */
-  {  1,   0}, {  4,   1}, {  5,   5}, {  1,   7}, {  3,   4}, {  1,   7}, 
+  {  1,   0}, {  4,   1}, {  5,   5}, {  1,   7}, {  3,   4}, {  1,   7},
   {  2,   5}, {  4,   4}, {  5,   5}, {  4,   1}, {  1,   5}, {  1,   0},  /* Row 15 */
-  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  2,   5}, 
+  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  2,   5},
   {  4,   4}, {  1,   5}, {  8,   1}, {  1,   5}, {  1,   0},              /* Row 16 */
-  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1}, 
+  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1},
   {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1}, {  1,   5}, {  1,   0},  /* Row 17 */
-  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1}, 
+  {  1,   0}, {  9,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1},
   {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1}, {  2,   0},              /* Row 18 */
-  {  1,   0}, {  1,   5}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7}, 
+  {  1,   0}, {  1,   5}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7},
   {  1,   1}, {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1}, {  2,   0},  /* Row 19 */
-  {  2,   0}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1}, 
+  {  2,   0}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1},
   {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1}, {  2,   0},              /* Row 20 */
-  {  2,   0}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1}, 
+  {  2,   0}, {  8,   1}, {  1,   7}, {  3,   4}, {  1,   7}, {  1,   1},
   {  1,   2}, {  4,   4}, {  1,   5}, {  7,   1}, {  1,   5}, {  2,   0},  /* Row 21 */
-  {  2,   0}, {  1,   5}, {  7,   1}, {  1,   7}, {  3,   4}, {  1,   6}, 
+  {  2,   0}, {  1,   5}, {  7,   1}, {  1,   7}, {  3,   4}, {  1,   6},
   {  1,   1}, {  1,   2}, {  4,   4}, {  1,   2}, {  7,   1}, {  3,   0},  /* Row 22 */
-  {  3,   0}, {  7,   1}, {  1,   2}, {  3,   6}, {  4,   2}, {  2,   6}, 
+  {  3,   0}, {  7,   1}, {  1,   2}, {  3,   6}, {  4,   2}, {  2,   6},
   {  2,   2}, {  6,   1}, {  1,   5}, {  3,   0},                          /* Row 23 */
   {  4,   0}, {  4,   1}, { 16,   2}, {  4,   1}, {  4,   0},              /* Row 24 */
   {  4,   0}, {  1,   5}, {  2,   1}, { 18,   2}, {  2,   1}, {  5,   0},  /* Row 25 */
-  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2}, 
+  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2},
   {  1,   5}, {  5,   0},                                                  /* Row 26 */
-  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5}, 
+  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5},
   {  4,   2}, {  7,   0},                                                  /* Row 27 */
-  {  8,   0}, {  3,   2}, {  4,   2}, {  2,   2}, {  4,   2}, {  2,   2}, 
+  {  8,   0}, {  3,   2}, {  4,   2}, {  2,   2}, {  4,   2}, {  2,   2},
   {  1,   5}, {  8,   0},                                                  /* Row 28 */
   {  9,   0}, {  1,   5}, {  3,   2}, {  6,   2}, {  3,   2}, { 10,   0},  /* Row 29 */
   { 12,   0}, {  8,   2}, { 12,   0},                                      /* Row 30 */
@@ -222,7 +222,7 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
 //  { 14,   0}, {  3,   4}, {  1,   7}, { 14,   0},                          /* Row 1 */
   { 14,   0}, {  4,   7}, { 14,   0},                                      /* Row 1 */
   { 10,   0}, { 12,   7}, { 10,   0},              /* Row 2 */
-  {  8,   0}, {  1,   7}, {  3,   6}, {  8,   7}, 
+  {  8,   0}, {  1,   7}, {  3,   6}, {  8,   7},
   {  3,   6}, {  1,   7}, {  8,   0},                                      /* Row 3 */
   {  7,   0}, {  7,   6}, {  3,   7}, {  8,   6}, {  7,   0},              /* Row 4 */
   {  6,   0}, {  3,   3}, { 13,   6}, {  4,   3}, {  6,   0},              /* Row 5 */
@@ -230,46 +230,46 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
   {  4,   0}, { 23,   3}, {  1,   2}, {  4,   0},                          /* Row 7 */
   {  3,   0}, {  1,   5}, { 23,   3}, {  1,   2}, {  1,   5}, {  3,   0},  /* Row 8 */
   {  3,   0}, {  3,   2}, { 18,   3}, {  5,   2}, {  3,   0},              /* Row 9 */
-  {  2,   0}, {  1,   5}, {  5,   2}, {  6,   3}, {  1,   6}, {  7,   3}, 
+  {  2,   0}, {  1,   5}, {  5,   2}, {  6,   3}, {  1,   6}, {  7,   3},
   {  2,   2}, {  2,   6}, {  3,   2}, {  1,   5}, {  2,   0},              /* Row 10 */
-  {  2,   0}, {  1,   5}, {  9,   2}, {  1,   6}, {  2,   4}, {  1,   3}, 
-  {  1,   2}, {  2,   3}, {  3,   2}, {  1,   6}, {  2,   4}, {  1,   6}, 
+  {  2,   0}, {  1,   5}, {  9,   2}, {  1,   6}, {  2,   4}, {  1,   3},
+  {  1,   2}, {  2,   3}, {  3,   2}, {  1,   6}, {  2,   4}, {  1,   6},
   {  3,   2}, {  1,   5}, {  2,   0},                                      /* Row 11 */
-  {  1,   0}, {  2,   5}, {  7,   2}, {  1,   6}, {  4,   4}, {  1,   3}, 
-  {  4,   2}, {  1,   3}, {  1,   7}, {  3,   4}, {  1,   7}, {  3,   2}, 
+  {  1,   0}, {  2,   5}, {  7,   2}, {  1,   6}, {  4,   4}, {  1,   3},
+  {  4,   2}, {  1,   3}, {  1,   7}, {  3,   4}, {  1,   7}, {  3,   2},
   {  1,   5}, {  2,   0},                                                  /* Row 12 */
-  {  1,   0}, {  5,   5}, {  2,   2}, {  1,   5}, {  1,   7}, {  5,   4}, 
-  {  1,   5}, {  3,   2}, {  1,   7}, {  5,   4}, {  1,   7}, {  1,   2}, 
+  {  1,   0}, {  5,   5}, {  2,   2}, {  1,   5}, {  1,   7}, {  5,   4},
+  {  1,   5}, {  3,   2}, {  1,   7}, {  5,   4}, {  1,   7}, {  1,   2},
   {  3,   5}, {  2,   0},                                                  /* Row 13 */
-  {  1,   0}, {  6,   5}, {  1,   7}, {  7,   4}, {  1,   5}, {  1,   2}, 
-  {  1,   7}, {  7,   4}, {  1,   7}, {  3,   5}, {  1,   1}, {  1,   5}, 
+  {  1,   0}, {  6,   5}, {  1,   7}, {  7,   4}, {  1,   5}, {  1,   2},
+  {  1,   7}, {  7,   4}, {  1,   7}, {  3,   5}, {  1,   1}, {  1,   5},
   {  1,   0},                                                              /* Row 14 */
-  {  1,   0}, {  4,   1}, {  1,   7}, {  9,   4}, {  1,   7}, {  9,   4}, 
+  {  1,   0}, {  4,   1}, {  1,   7}, {  9,   4}, {  1,   7}, {  9,   4},
   {  1,   7}, {  4,   1}, {  1,   5}, {  1,   0},                          /* Row 15 */
-  {  1,   0}, {  4,   1}, {  1,   5}, {  9,   4}, {  1,   7}, {  9,   4}, 
+  {  1,   0}, {  4,   1}, {  1,   5}, {  9,   4}, {  1,   7}, {  9,   4},
   {  1,   5}, {  4,   1}, {  1,   5}, {  1,   0},                          /* Row 16 */
-  {  1,   0}, {  6,   1}, {  1,   5}, {  7,   4}, {  1,   5}, {  1,   1}, 
+  {  1,   0}, {  6,   1}, {  1,   5}, {  7,   4}, {  1,   5}, {  1,   1},
   {  1,   5}, {  7,   4}, {  1,   5}, {  4,   1}, {  1,   5}, {  1,   0},  /* Row 17 */
-  {  1,   0}, {  8,   1}, {  1,   7}, {  5,   4}, {  1,   5}, {  3,   1}, 
+  {  1,   0}, {  8,   1}, {  1,   7}, {  5,   4}, {  1,   5}, {  3,   1},
   {  1,   7}, {  5,   4}, {  1,   5}, {  4,   1}, {  2,   0},              /* Row 18 */
-  {  1,   0}, {  1,   5}, {  8,   1}, {  1,   5}, {  4,   4}, {  1,   5}, 
+  {  1,   0}, {  1,   5}, {  8,   1}, {  1,   5}, {  4,   4}, {  1,   5},
   {  4,   1}, {  1,   5}, {  4,   4}, {  1,   5}, {  4,   1}, {  2,   0},  /* Row 19 */
-  {  2,   0}, { 10,   1}, {  1,   7}, {  2,   4}, {  1,   2}, {  6,   1}, 
+  {  2,   0}, { 10,   1}, {  1,   7}, {  2,   4}, {  1,   2}, {  6,   1},
   {  1,   7}, {  2,   4}, {  1,   5}, {  4,   1}, {  2,   0},              /* Row 20 */
-  {  2,   0}, { 11,   1}, {  1,   5}, {  1,   4}, {  1,   2}, {  7,   1}, 
+  {  2,   0}, { 11,   1}, {  1,   5}, {  1,   4}, {  1,   2}, {  7,   1},
   {  1,   5}, {  1,   7}, {  1,   5}, {  3,   1}, {  1,   5}, {  2,   0},  /* Row 21 */
-  {  2,   0}, {  1,   5}, {  9,   1}, {  1,   2}, {  1,   1}, {  6,   2}, 
+  {  2,   0}, {  1,   5}, {  9,   1}, {  1,   2}, {  1,   1}, {  6,   2},
   {  9,   1}, {  3,   0},                                                  /* Row 22 */
   {  3,   0}, {  7,   1}, { 12,   2}, {  6,   1}, {  1,   5}, {  3,   0},  /* Row 23 */
   {  4,   0}, {  5,   1}, { 14,   2}, {  5,   1}, {  4,   0},              /* Row 24 */
   {  4,   0}, {  1,   5}, {  2,   1}, { 18,   2}, {  2,   1}, {  5,   0},  /* Row 25 */
-  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2}, 
+  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2},
   {  1,   5}, {  5,   0},                                                  /* Row 26 */
-  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5}, 
+  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5},
   {  4,   2}, {  7,   0},                                                  /* Row 27 */
-  {  8,   0}, {  3,   2}, {  3,   2}, {  4,   2}, {  3,   2}, {  2,   2}, 
+  {  8,   0}, {  3,   2}, {  3,   2}, {  4,   2}, {  3,   2}, {  2,   2},
   {  1,   5}, {  8,   0},                                                  /* Row 28 */
-  {  9,   0}, {  1,   5}, {  3,   2}, {  6,   2}, {  2,   2}, {  1,   5}, 
+  {  9,   0}, {  1,   5}, {  3,   2}, {  6,   2}, {  2,   2}, {  1,   5},
   { 10,   0},                                                              /* Row 29 */
   { 12,   0}, {  3,   2}, {  2,   2}, {  3,   2}, { 12,   0},              /* Row 30 */
   { 32,   0},                                                              /* Row 31 */
@@ -293,7 +293,7 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
   { 32,   0},                                                              /* Row 0 */
   { 14,   0}, {  4,   7}, { 14,   0},                                      /* Row 1 */
   { 10,   0}, { 12,   7}, { 10,   0},                                      /* Row 2 */
-  {  8,   0}, {  1,   7}, {  3,   6}, {  8,   7}, 
+  {  8,   0}, {  1,   7}, {  3,   6}, {  8,   7},
   {  3,   6}, {  1,   7}, {  8,   0},                                      /* Row 3 */
   {  7,   0}, {  7,   6}, {  3,   7}, {  8,   6}, {  7,   0},              /* Row 4 */
   {  6,   0}, {  3,   3}, { 13,   6}, {  4,   3}, {  6,   0},              /* Row 5 */
@@ -301,47 +301,47 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
   {  4,   0}, {  1,   2}, { 22,   3}, {  1,   2}, {  4,   0},              /* Row 7 */
   {  3,   0}, {  1,   5}, { 23,   3}, {  1,   2}, {  1,   5}, {  3,   0},  /* Row 8 */
   {  3,   0}, {  3,   2}, { 19,   3}, {  4,   2}, {  3,   0},              /* Row 9 */
-  {  2,   0}, {  1,   5}, {  3,   2}, {  2,   6}, {  2,   2}, {  7,   3}, 
+  {  2,   0}, {  1,   5}, {  3,   2}, {  2,   6}, {  2,   2}, {  7,   3},
   {  1,   6}, {  5,   3}, {  6,   2}, {  1,   5}, {  2,   0},              /* Row 10 */
-  {  2,   0}, {  1,   5}, {  3,   2}, {  1,   7}, {  2,   4}, {  1,   3}, 
-  {  2,   2}, {  3,   3}, {  1,   2}, {  1,   6}, {  2,   4}, {  1,   6}, 
+  {  2,   0}, {  1,   5}, {  3,   2}, {  1,   7}, {  2,   4}, {  1,   3},
+  {  2,   2}, {  3,   3}, {  1,   2}, {  1,   6}, {  2,   4}, {  1,   6},
   {  9,   2}, {  1,   5}, {  2,   0},                                      /* Row 11 */
-  {  1,   0}, {  2,   5}, {  3,   2}, {  1,   7}, {  3,   4}, {  1,   7}, 
-  {  5,   2}, {  1,   6}, {  4,   4}, {  1,   5}, {  7,   2}, {  1,   5}, 
+  {  1,   0}, {  2,   5}, {  3,   2}, {  1,   7}, {  3,   4}, {  1,   7},
+  {  5,   2}, {  1,   6}, {  4,   4}, {  1,   5}, {  7,   2}, {  1,   5},
   {  2,   0},                                                              /* Row 12 */
-  {  1,   0}, {  4,   5}, {  1,   2}, {  1,   7}, {  5,   4}, {  1,   7}, 
-  {  3,   2}, {  1,   6}, {  5,   4}, {  1,   7}, {  1,   5}, {  2,   2}, 
+  {  1,   0}, {  4,   5}, {  1,   2}, {  1,   7}, {  5,   4}, {  1,   7},
+  {  3,   2}, {  1,   6}, {  5,   4}, {  1,   7}, {  1,   5}, {  2,   2},
   {  4,   5}, {  2,   0},                                                  /* Row 13 */
-  {  1,   0}, {  1,   5}, {  1,   1}, {  2,   5}, {  1,   1}, {  1,   7}, 
-  {  7,   4}, {  1,   7}, {  1,   2}, {  1,   5}, {  7,   4}, {  1,   7}, 
+  {  1,   0}, {  1,   5}, {  1,   1}, {  2,   5}, {  1,   1}, {  1,   7},
+  {  7,   4}, {  1,   7}, {  1,   2}, {  1,   5}, {  7,   4}, {  1,   7},
   {  4,   5}, {  1,   1}, {  1,   5}, {  1,   0},                          /* Row 14 */
-  {  1,   0}, {  5,   1}, {  1,   7}, {  9,   4}, {  1,   7}, {  9,   4}, 
+  {  1,   0}, {  5,   1}, {  1,   7}, {  9,   4}, {  1,   7}, {  9,   4},
   {  1,   5}, {  3,   1}, {  1,   5}, {  1,   0},                          /* Row 15 */
-  {  1,   0}, {  5,   1}, {  1,   7}, {  8,   4}, {  2,   7}, {  8,   4}, 
+  {  1,   0}, {  5,   1}, {  1,   7}, {  8,   4}, {  2,   7}, {  8,   4},
   {  1,   7}, {  4,   1}, {  1,   5}, {  1,   0},                          /* Row 16 */
-  {  1,   0}, {  5,   1}, {  1,   5}, {  7,   4}, {  1,   5}, {  1,   1}, 
+  {  1,   0}, {  5,   1}, {  1,   5}, {  7,   4}, {  1,   5}, {  1,   1},
   {  1,   5}, {  7,   4}, {  1,   5}, {  5,   1}, {  1,   5}, {  1,   0},  /* Row 17 */
-  {  1,   0}, {  5,   1}, {  1,   5}, {  5,   4}, {  1,   7}, {  3,   1}, 
+  {  1,   0}, {  5,   1}, {  1,   5}, {  5,   4}, {  1,   7}, {  3,   1},
   {  1,   5}, {  5,   4}, {  1,   7}, {  7,   1}, {  2,   0},              /* Row 18 */
-  {  1,   0}, {  1,   5}, {  4,   1}, {  1,   5}, {  3,   4}, {  1,   7}, 
-  {  1,   2}, {  4,   1}, {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1}, 
+  {  1,   0}, {  1,   5}, {  4,   1}, {  1,   5}, {  3,   4}, {  1,   7},
+  {  1,   2}, {  4,   1}, {  1,   5}, {  4,   4}, {  1,   5}, {  8,   1},
   {  2,   0},                                                              /* Row 19 */
-  {  2,   0}, {  4,   1}, {  1,   5}, {  2,   4}, {  1,   5}, {  6,   1}, 
+  {  2,   0}, {  4,   1}, {  1,   5}, {  2,   4}, {  1,   5}, {  6,   1},
   {  1,   5}, {  2,   4}, {  1,   7}, { 10,   1}, {  2,   0},              /* Row 20 */
-  {  2,   0}, {  4,   1}, {  2,   7}, {  8,   1}, {  1,   5}, {  1,   4}, 
+  {  2,   0}, {  4,   1}, {  2,   7}, {  8,   1}, {  1,   5}, {  1,   4},
   {  1,   2}, { 10,   1}, {  1,   5}, {  2,   0},                          /* Row 21 */
-  {  2,   0}, {  1,   5}, {  9,   1}, {  6,   2}, {  1,   1}, {  1,   2}, 
+  {  2,   0}, {  1,   5}, {  9,   1}, {  6,   2}, {  1,   1}, {  1,   2},
   {  9,   1}, {  3,   0},                                                  /* Row 22 */
   {  3,   0}, {  7,   1}, { 12,   2}, {  6,   1}, {  1,   5}, {  3,   0},  /* Row 23 */
   {  4,   0}, {  5,   1}, { 14,   2}, {  5,   1}, {  4,   0},              /* Row 24 */
   {  4,   0}, {  1,   5}, {  2,   1}, { 18,   2}, {  2,   1}, {  5,   0},  /* Row 25 */
-  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2}, 
+  {  5,   0}, {  1,   5}, {  1,   1}, {  6,   2}, {  6,   2}, {  7,   2},
   {  1,   5}, {  5,   0},                                                  /* Row 26 */
-  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5}, 
+  {  6,   0}, {  1,   5}, {  4,   2}, {  1,   5}, {  8,   2}, {  1,   5},
   {  4,   2}, {  7,   0},                                                  /* Row 27 */
-  {  8,   0}, {  3,   2}, {  3,   2}, {  4,   2}, {  3,   2}, {  2,   2}, 
+  {  8,   0}, {  3,   2}, {  3,   2}, {  4,   2}, {  3,   2}, {  2,   2},
   {  1,   5}, {  8,   0},                                                  /* Row 28 */
-  {  9,   0}, {  1,   5}, {  3,   2}, {  6,   2}, {  2,   2}, {  1,   5}, 
+  {  9,   0}, {  1,   5}, {  3,   2}, {  6,   2}, {  2,   2}, {  1,   5},
   { 10,   0},                                                              /* Row 29 */
   { 12,   0}, {  3,   2}, {  2,   2}, {  3,   2}, { 12,   0},              /* Row 30 */
   { 32,   0},                                                              /* Row 31 */
@@ -367,7 +367,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
   {  3,   0}, {  5,   3}, {  6,   6}, {  5,   3}, {  3,   0},              /* Row 4 */
   {  3,   0}, { 16,   3}, {  3,   0},                                      /* Row 5 */
   {  2,   0}, {  2,   2}, { 13,   3}, {  3,   2}, {  2,   0},              /* Row 6 */
-  {  1,   0}, {  1,   5}, {  4,   2}, { 10,   3}, {  4,   2}, {  1,   5}, 
+  {  1,   0}, {  1,   5}, {  4,   2}, { 10,   3}, {  4,   2}, {  1,   5},
   {  1,   0},                                                              /* Row 7 */
   {  1,   0}, {  2,   5}, { 15,   2}, {  3,   5}, {  1,   0},              /* Row 8 */
   {  1,   0}, {  5,   5}, { 10,   2}, {  5,   5}, {  1,   0},              /* Row 9 */
@@ -376,7 +376,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
   {  1,   0}, { 20,   1}, {  1,   0},                                      /* Row 12 */
   {  1,   0}, { 20,   1}, {  1,   0},                                      /* Row 13 */
   {  1,   0}, { 19,   1}, {  1,   5}, {  1,   0},                          /* Row 14 */
-  {  1,   0}, {  1,   5}, {  7,   1}, {  1,   5}, {  4,   2}, {  6,   1}, 
+  {  1,   0}, {  1,   5}, {  7,   1}, {  1,   5}, {  4,   2}, {  6,   1},
   {  2,   0},                                                              /* Row 15 */
   {  2,   0}, {  5,   1}, {  8,   2}, {  4,   1}, {  1,   5}, {  2,   0},  /* Row 16 */
   {  3,   0}, {  2,   1}, { 12,   2}, {  2,   1}, {  3,   0},              /* Row 17 */
diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx
index 213db54dd..efa83f7ed 100644
--- a/NxWidgets/nxwm/src/glyph_nsh.cxx
+++ b/NxWidgets/nxwm/src/glyph_nsh.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -205,7 +205,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_nshBitmap =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_nshLut,            //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_play24x24.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx
index ffe389fc5..c96ef0b03 100644
--- a/NxWidgets/nxwm/src/glyph_play24x24.cxx
+++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -248,7 +248,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap24x24 =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_playNormalLut,     //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx
index ce1bf6a2c..2fd7b3cd1 100644
--- a/NxWidgets/nxwm/src/glyph_start.cxx
+++ b/NxWidgets/nxwm/src/glyph_start.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -206,7 +206,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_startBitmap =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_startLut,          //          Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx
index 74836e01d..d9436b5d8 100644
--- a/NxWidgets/nxwm/src/glyph_stop.cxx
+++ b/NxWidgets/nxwm/src/glyph_stop.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -184,7 +184,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap =
   CONFIG_NXWIDGETS_BPP,  // bpp    - Bits per pixel
   CONFIG_NXWIDGETS_FMT,  // fmt    - Color format
   BITMAP_NLUTCODES,      // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,       // width  - Width in pixels 
+  BITMAP_NCOLUMNS,       // width  - Width in pixels
   BITMAP_NROWS,          // height - Height in rows
   {                      // lut    - Pointer to the beginning of the Look-Up Table (LUT)
     g_stopNormalLut,     //          Index 0: Unselected LUT