3 files changed, 10 insertions, 11 deletions
diff --git a/nuttx/graphics/nxtk/nxtk_closetoolbar.c b/nuttx/graphics/nxtk/nxtk_closetoolbar.c
index 22decf804..2cd44dfc3 100644
--- a/nuttx/graphics/nxtk/nxtk_closetoolbar.c
+++ b/nuttx/graphics/nxtk/nxtk_closetoolbar.c
@@ -84,11 +84,11 @@
  *   htb - The toolbar handle returned by nxtk_opentoolbar
  *
  * Return:
- *   None
+ *   OK on success; ERROR on failure with errno set appropriately
  *
  ****************************************************************************/
 
-void nxtk_closetoolbar(NXTKTOOLBAR htb)
+int nxtk_closetoolbar(NXTKTOOLBAR htb)
 {
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)htb;
 
@@ -107,5 +107,6 @@ void nxtk_closetoolbar(NXTKTOOLBAR htb)
    */
 
   nxfe_redrawreq(&fwnd->wnd, &fwnd->wnd.bounds);
+  return OK;
 }
 
diff --git a/nuttx/graphics/nxtk/nxtk_closewindow.c b/nuttx/graphics/nxtk/nxtk_closewindow.c
index e97c3fccf..edc9e457d 100644
--- a/nuttx/graphics/nxtk/nxtk_closewindow.c
+++ b/nuttx/graphics/nxtk/nxtk_closewindow.c
@@ -84,13 +84,12 @@
  *   hfwnd - The handle returned by nxtk_openwindow
  *
  * Return:
- *   Success: A non-NULL handle used with subsequent NXTK window accesses
- *   Failure:  NULL is returned and errno is set appropriately
+ *   OK on success; ERROR on failure with errno set appropriately
  *
  ****************************************************************************/
 
-void nxtk_closewindow(NXTKWINDOW hfwnd)
+int nxtk_closewindow(NXTKWINDOW hfwnd)
 {
-  nx_closewindow((NXWINDOW)hfwnd);
+  return nx_closewindow((NXWINDOW)hfwnd);
 }
 
diff --git a/nuttx/include/nuttx/nxtk.h b/nuttx/include/nuttx/nxtk.h
index c8e81a140..4a6d9d5cd 100644
--- a/nuttx/include/nuttx/nxtk.h
+++ b/nuttx/include/nuttx/nxtk.h
@@ -108,12 +108,11 @@ EXTERN NXTKWINDOW nxtk_openwindow(NXHANDLE handle,
  *   hfwnd - The handle returned by nxtk_openwindow
  *
  * Return:
- *   Success: A non-NULL handle used with subsequent NXTK window accesses
- *   Failure:  NULL is returned and errno is set appropriately
+ *   OK on success; ERROR on failure with errno set appropriately
  *
  ****************************************************************************/
 
-EXTERN void nxtk_closewindow(NXTKWINDOW hfwnd);
+EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd);
 
 /****************************************************************************
  * Name: nxtk_getposition
@@ -309,11 +308,11 @@ EXTERN NXTKTOOLBAR nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
  *   htb - The toolbar handle returned by nxtk_opentoolbar
  *
  * Return:
- *   None
+ *   OK on success; ERROR on failure with errno set appropriately
  *
  ****************************************************************************/
 
-EXTERN void nxtk_closetoolbar(NXTKTOOLBAR htb);
+EXTERN int nxtk_closetoolbar(NXTKTOOLBAR htb);
 
 /****************************************************************************
  * Name: nxtk_filltoolbar