sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CTaskBar: Fix type checking issue with GCC 6

Browse Source
This commit is contained in:
Sakari Kapanen 2017-11-08 07:23:01 -06:00 committed by Gregory Nutt
parent ec05d491e1
commit ac52348e79
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxygen/Doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = NXWidgets
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # 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) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

3
nxwm/src/ctaskbar.cxx
View File

@ -855,7 +855,7 @@ NXWidgets::CNxTkWindow *CTaskbar::openFramedWindow(void)
if (!window) if (!window)
{ {
delete control; delete control;
return false; return (NXWidgets::CNxTkWindow *)0;
} }
// Open (and initialize) the window // Open (and initialize) the window
@ -865,7 +865,6 @@ NXWidgets::CNxTkWindow *CTaskbar::openFramedWindow(void)
{ {
delete window; delete window;
window = (NXWidgets::CNxTkWindow *)0; window = (NXWidgets::CNxTkWindow *)0;
return false;
} }
return window; return window;