summaryrefslogtreecommitdiff
path: root/NxWidgets/UnitTests
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-05-15 16:45:57 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-05-15 16:45:57 -0600
commit34c08471a0ea3a1705e0f6244b318dcfe8f3090d (patch)
treeece4f76d5892b2029e3e2ef7a5739c60fc10e67d /NxWidgets/UnitTests
parent1ca4adc13c09facc71524e80a0bb134c6921598c (diff)
downloadnuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.tar.gz
nuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.tar.bz2
nuttx-34c08471a0ea3a1705e0f6244b318dcfe8f3090d.zip
Add NxWdigets::CGlyphSliderHorizontal and associated grip widgets. From Ken Pettit.
Diffstat (limited to 'NxWidgets/UnitTests')
-rw-r--r--NxWidgets/UnitTests/nxwm/nxwm_main.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
index 04ffb64ba..26ab1b2d3 100644
--- a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
+++ b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
@@ -574,8 +574,8 @@ static bool createMediaPlayer(void)
// Add the hex calculator application to the start window
printf("createHexCalculator: Creating the hex calculator application\n");
- NxWM::CMediaPlayerFactory *calculator = new NxWM::CMediaPlayerFactory(g_nxwmtest.taskbar);
- if (!calculator)
+ NxWM::CMediaPlayerFactory *mediaplayer = new NxWM::CMediaPlayerFactory(g_nxwmtest.taskbar);
+ if (!mediaplayer)
{
printf("createMediaPlayer: ERROR: Failed to instantiate CMediaPlayerFactory\n");
return false;
@@ -583,10 +583,10 @@ static bool createMediaPlayer(void)
showTestCaseMemory("createMediaPlayer: After creating the media player application");
printf("createMediaPlayer: Adding the hex calculator application to the start window\n");
- if (!g_nxwmtest.startwindow->addApplication(calculator))
+ if (!g_nxwmtest.startwindow->addApplication(mediaplayer))
{
printf("createMediaPlayer: ERROR: Failed to add CNxConsoleFactory to the start window\n");
- delete calculator;
+ delete mediaplayer;
return false;
}