From addae64d8c028ffd2c3bb05ec7ebdd1a73720998 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 2 May 2012 14:38:54 +0000
Subject: NxWM initial displays come up okay

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4687 42af7a65-404d-4744-a932-0658087f49c3
---
 NxWidgets/UnitTests/nxwm/main.cxx | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'NxWidgets/UnitTests')

diff --git a/NxWidgets/UnitTests/nxwm/main.cxx b/NxWidgets/UnitTests/nxwm/main.cxx
index d0050b2bd..8da6839a6 100644
--- a/NxWidgets/UnitTests/nxwm/main.cxx
+++ b/NxWidgets/UnitTests/nxwm/main.cxx
@@ -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)
-- 
cgit v1.2.3