Fix files under NxWidgets to use the corrected syslog interfaces

3 files changed, 19 insertions, 28 deletions

diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index f9c322299..da919612c 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous,
 
   /* Show the change from the previous time */
 
-  message("\n%s:\n", msg);
-  message("  Before: %8d After: %8d Change: %8d\n\n",
-          previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
+  printf("\n%s:\n", msg);
+  printf("  Before: %8d After: %8d Change: %8d\n\n",
+         previous, mmcurrent.uordblks, mmcurrent.uordblks - previous);
 
   /* Set up for the next test */
 
@@ -143,16 +143,16 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
 
   // Create an instance of the checkbox test
 
-  message("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n");
+  printf("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n");
   CScrollbarHorizontalTest *test = new CScrollbarHorizontalTest();
   updateMemoryUsage(g_mmprevious, "After creating CScrollbarHorizontalTest");
 
   // Connect the NX server
 
-  message("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n");
+  printf("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n");
   if (!test->connect())
     {
-      message("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n");
+      printf("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n");
       delete test;
       return 1;
     }
@@ -160,10 +160,10 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
 
   // Create a window to draw into
 
-  message("cscrollbarhorizontal_main: Create a Window\n");
+  printf("cscrollbarhorizontal_main: Create a Window\n");
   if (!test->createWindow())
     {
-      message("cscrollbarhorizontal_main: Failed to create a window\n");
+      printf("cscrollbarhorizontal_main: Failed to create a window\n");
       delete test;
       return 1;
     }
@@ -171,11 +171,11 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
 
   // Create a scrollbar
 
-  message("cscrollbarhorizontal_main: Create a Scrollbar\n");
+  printf("cscrollbarhorizontal_main: Create a Scrollbar\n");
   CScrollbarHorizontal *scrollbar = test->createScrollbar();
   if (!scrollbar)
     {
-      message("cscrollbarhorizontal_main: Failed to create a scrollbar\n");
+      printf("cscrollbarhorizontal_main: Failed to create a scrollbar\n");
       delete test;
       return 1;
     }
@@ -186,9 +186,9 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
   scrollbar->setMinimumValue(0);
   scrollbar->setMaximumValue(MAX_SCROLLBAR);
   scrollbar->setValue(0);
-  message("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n",
-          scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
-          scrollbar->getValue());
+  printf("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n",
+         scrollbar->getMinimumValue(), scrollbar->getMaximumValue(),
+         scrollbar->getValue());
 
   // Show the initial state of the checkbox
 
@@ -201,7 +201,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
+      printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(1000); // The simulation needs this to let the X11 event loop run
     }
   updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar up");
@@ -212,7 +212,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
     {
       scrollbar->setValue(i);
       test->showScrollbar(scrollbar);
-      message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
+      printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue());
       usleep(1000); // The simulation needs this to let the X11 event loop run
     }
   updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar down");
@@ -220,7 +220,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[])
 
   // Clean up and exit
 
-  message("cscrollbarhorizontal_main: Clean-up and exit\n");
+  printf("cscrollbarhorizontal_main: Clean-up and exit\n");
   delete scrollbar;
   updateMemoryUsage(g_mmprevious, "After deleting the scrollbar");
   delete test;
diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
index 06673f080..42571a574 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
@@ -105,7 +105,7 @@ bool CScrollbarHorizontalTest::connect(void)
 
       if (!setBackgroundColor(CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR))
         {
-          message("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n");
+          printf("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n");
         }
     }
 
@@ -161,7 +161,7 @@ bool CScrollbarHorizontalTest::createWindow(void)
   m_bgWindow = getBgWindow(m_widgetControl);
   if (!m_bgWindow)
     {
-      message("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n");
+      printf("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n");
       disconnect();
       return false;
     }
@@ -171,7 +171,7 @@ bool CScrollbarHorizontalTest::createWindow(void)
   bool success = m_bgWindow->open();
   if (!success)
     {
-      message("CScrollbarHorizontalTest::createWindow: Failed to open background window\n");
+      printf("CScrollbarHorizontalTest::createWindow: Failed to open background window\n");
       disconnect();
       return false;
     }
diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
index 30f66ca45..7047eb861 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
@@ -69,15 +69,6 @@
 #  define CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
 #endif
 
-// If debug is enabled, use the debug function, syslog() instead
-// of printf() so that the output is synchronized.
-
-#ifdef CONFIG_DEBUG
-#  define message lowsyslog
-#else
-#  define message printf
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 // Public Classes
 /////////////////////////////////////////////////////////////////////////////