fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 06:51:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

NxWM initial displays come up okay

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4687 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-05-02 14:38:54 +00:00
parent 0bb02729f1
commit d7c6496584
10 changed files with 282 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NxWidgets/UnitTests/nxwm/main.cxx
+28 -1
View File
@@ -162,9 +162,18 @@ int MAIN_NAME(int argc, char *argv[])
return EXIT_FAILURE;
}
printf(MAIN_STRING "Initialize the CApplicationWindow\n");
if (!window->open())
{
printf(MAIN_STRING "ERROR: Failed to open the CApplicationWindow \n");
delete window;
delete g_nxwmtest.taskbar;
return EXIT_FAILURE;
}
printf(MAIN_STRING "Creating the start window application\n");
g_nxwmtest.startwindow = new NxWM::CStartWindow(g_nxwmtest.taskbar, window);
if (!g_nxwmtest.taskbar)
if (!g_nxwmtest.startwindow)
{
printf(MAIN_STRING "ERROR: Failed to instantiate CStartWindow\n");
delete window;
@@ -195,6 +204,15 @@ int MAIN_NAME(int argc, char *argv[])
goto noconsole;
}
printf(MAIN_STRING "Initialize the CApplicationWindow\n");
if (!window->open())
{
printf(MAIN_STRING "ERROR: Failed to open the CApplicationWindow \n");
delete window;
delete g_nxwmtest.taskbar;
return EXIT_FAILURE;
}
printf(MAIN_STRING "Creating the NxConsole application\n");
console = new NxWM::CNxConsole(g_nxwmtest.taskbar, window);
if (!console)
@@ -226,6 +244,15 @@ noconsole:
goto nocalculator;
}
printf(MAIN_STRING "Initialize the CApplicationWindow\n");
if (!window->open())
{
printf(MAIN_STRING "ERROR: Failed to open the CApplicationWindow \n");
delete window;
delete g_nxwmtest.taskbar;
return EXIT_FAILURE;
}
printf(MAIN_STRING "Creating the calculator application\n");
calculator = new NxWM::CCalculator(g_nxwmtest.taskbar, window);
if (!calculator)