Patches from Petteri Aimonen (plus a few other things)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5448 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 0 insertions, 19 deletions

diff --git a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx
index b5f96683d..0fdbba73c 100644
--- a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx
+++ b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx
@@ -309,30 +309,21 @@ void CCycleButton::drawContents(CGraphicsPort *port)
   CRect rect;
   getRect(rect);
 
-  nxgl_coord_t glyphSpace   = m_borderSize.left - 1;
   nxgl_coord_t glyphYOffset = (rect.getHeight() - g_cycle.height) >> 1;
 
   nxwidget_pixel_t textColor;
-  nxwidget_pixel_t separatorLeftColor;
-  nxwidget_pixel_t separatorRightColor;
 
   if (!isEnabled())
     {
       textColor           = getDisabledTextColor();
-      separatorLeftColor  = getShadowEdgeColor();
-      separatorRightColor = getShineEdgeColor();
     }
   else if (!isClicked())
     {
       textColor           = getEnabledTextColor();
-      separatorLeftColor  = getShadowEdgeColor();
-      separatorRightColor = getShineEdgeColor();
     }
   else
     {
       textColor           = getSelectedTextColor();
-      separatorLeftColor  = getShineEdgeColor();
-      separatorRightColor = getShadowEdgeColor();
     }
 
   // Draw cycle glyph
@@ -341,16 +332,6 @@ void CCycleButton::drawContents(CGraphicsPort *port)
                    g_cycle.width, g_cycle.height, &g_cycle,
                    0, 0, CONFIG_NXWIDGETS_TRANSPARENT_COLOR);
 
-  // Draw separator
-
-  nxgl_coord_t x = getX() + glyphSpace + g_cycle.width;
-  nxgl_coord_t y = getY();
-  nxgl_coord_t w = glyphSpace + g_cycle.width;
-  nxgl_coord_t h = rect.getHeight() - 1;
-
-  port->drawLine(x, y, w, h, separatorLeftColor);
-  port->drawLine(x+1, y, w+1, h, separatorRightColor);
-
   // Only draw text if option is selected
 
   if (m_options.getSelectedItem() != NULL)