diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 22:41:11 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 22:41:11 +0000 |
| commit | ef0b23ea7dba56647ceffa0b561d971f7f963540 (patch) | |
| tree | aa2fdfc42b8d3994288a6dc854163e993ac5b1bf /NxWidgets/UnitTests/CGlyphButton | |
| parent | 4dedf494c242b2c4b52707441eefe2a36fbacf0f (diff) | |
| download | nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.gz nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.bz2 nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.zip | |
Prep for NxWidgets 1.0 release
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4506 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/UnitTests/CGlyphButton')
| -rw-r--r-- | NxWidgets/UnitTests/CGlyphButton/Makefile | 4 | ||||
| -rw-r--r-- | NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/NxWidgets/UnitTests/CGlyphButton/Makefile b/NxWidgets/UnitTests/CGlyphButton/Makefile index 527d882fa..01e843555 100644 --- a/NxWidgets/UnitTests/CGlyphButton/Makefile +++ b/NxWidgets/UnitTests/CGlyphButton/Makefile @@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs # Add the path to the NXWidget include directory to the CFLAGS -NXWIDGETS_DIR="$(TESTDIR)/../../NXWidgets/libnxwidgets" +NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets" NXWIDGETS_INC="$(NXWIDGETS_DIR)/include" NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)" @@ -56,7 +56,7 @@ endif # Get the path to the archiver tool -TESTTOOL_DIR="$(TESTDIR)/../tools" +TESTTOOL_DIR="$(TESTDIR)/../../tools" ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh # Hello, World! C++ Example diff --git a/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx index 889ce21ca..940d82a9f 100644 --- a/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx +++ b/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx @@ -69,7 +69,7 @@ #endif #ifndef CONFIG_CGLYPHBUTTONTEST_BGCOLOR -# define CONFIG_CGLYPHBUTTONTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKCOLOR +# define CONFIG_CGLYPHBUTTONTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif #ifndef CONFIG_CGLYPHBUTTONTEST_FONTCOLOR |