From ac52348e795de004b3814215684ae0e15c64f7af Mon Sep 17 00:00:00 2001
From: Sakari Kapanen <sakari.kapanen@optofidelity.com>
Date: Wed, 8 Nov 2017 07:23:01 -0600
Subject: [PATCH] CTaskBar: Fix type checking issue with GCC 6

---
 Doxygen/Doxyfile      | 2 +-
 nxwm/src/ctaskbar.cxx | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Doxygen/Doxyfile b/Doxygen/Doxyfile
index 399fa553b..c1f344df6 100644
--- a/Doxygen/Doxyfile
+++ b/Doxygen/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = NXWidgets
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = "1.15"
+PROJECT_NUMBER         = "1.18"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/nxwm/src/ctaskbar.cxx b/nxwm/src/ctaskbar.cxx
index 6b578109d..bf24c3dcb 100644
--- a/nxwm/src/ctaskbar.cxx
+++ b/nxwm/src/ctaskbar.cxx
@@ -855,7 +855,7 @@ NXWidgets::CNxTkWindow *CTaskbar::openFramedWindow(void)
   if (!window)
     {
       delete control;
-      return false;
+      return (NXWidgets::CNxTkWindow *)0;
     }
 
   // Open (and initialize) the window
@@ -865,7 +865,6 @@ NXWidgets::CNxTkWindow *CTaskbar::openFramedWindow(void)
     {
       delete window;
       window = (NXWidgets::CNxTkWindow *)0;
-      return false;
     }
 
   return window;