diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-15 14:37:37 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-15 14:37:37 +0000 |
| commit | 327fb90cd335dc8d61d66c81487f73a5fc6f19a5 (patch) | |
| tree | 7783ffd51c6a828b6b135733f489a14d45734f68 /NxWidgets | |
| parent | 6132a9da939698fe9d5d3a7310d1287d5cb7a1a7 (diff) | |
| download | px4-nuttx-327fb90cd335dc8d61d66c81487f73a5fc6f19a5.tar.gz px4-nuttx-327fb90cd335dc8d61d66c81487f73a5fc6f19a5.tar.bz2 px4-nuttx-327fb90cd335dc8d61d66c81487f73a5fc6f19a5.zip | |
STM32 F4 patches from Petteri Aimonen (mostly USB)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5652 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/clabel.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 43347fcdb..dd3422dcc 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -278,4 +278,6 @@ action event. From Petteri Aimonen. * NxWidgets/tools/bitmap_converter.py: Fix bitmap_converter.py so that it works with indexed input images. +* NxWidgets::CLabel: Fix backward conditional compilation in the + "flicker free" logic. diff --git a/NxWidgets/libnxwidgets/src/clabel.cxx b/NxWidgets/libnxwidgets/src/clabel.cxx index be4fe902d..376d2ce8f 100644 --- a/NxWidgets/libnxwidgets/src/clabel.cxx +++ b/NxWidgets/libnxwidgets/src/clabel.cxx @@ -303,7 +303,7 @@ void CLabel::drawContents(CGraphicsPort *port) // Draw the background (excluding the border) -#ifdef CONFIG_NXWIDGETS_FLICKERFREE +#ifndef CONFIG_NXWIDGETS_FLICKERFREE port->drawFilledRect(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight(), backColor); #endif |