From a96a12751aa7f22509a8ff0ab6d55056319e9758 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 15 Feb 2013 14:37:37 +0000 Subject: [PATCH] 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 --- ChangeLog.txt | 2 ++ libnxwidgets/src/clabel.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 43347fcdb..dd3422dcc 100644 --- a/ChangeLog.txt +++ b/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/libnxwidgets/src/clabel.cxx b/libnxwidgets/src/clabel.cxx index be4fe902d..376d2ce8f 100644 --- a/libnxwidgets/src/clabel.cxx +++ b/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