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

Remove warnings when CONFIG_NXTK_BORDERWIDTH is set to zero. From Pierre-Noel Bouteville

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-20 16:44:08 -06:00
parent 62462d247b
commit ec30a0bae5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnx/nxtk/nxtk_drawframe.c
View File

@ -73,6 +73,7 @@
* Name: nxtk_drawframeside * Name: nxtk_drawframeside
****************************************************************************/ ****************************************************************************/
#if CONFIG_NXTK_BORDERWIDTH > 0
static void nxtk_drawframeside(FAR struct nxtk_framedwindow_s *fwnd, static void nxtk_drawframeside(FAR struct nxtk_framedwindow_s *fwnd,
FAR const struct nxgl_rect_s *side, FAR const struct nxgl_rect_s *side,
FAR const struct nxgl_rect_s *bounds, FAR const struct nxgl_rect_s *bounds,
@ -85,6 +86,7 @@ static void nxtk_drawframeside(FAR struct nxtk_framedwindow_s *fwnd,
nx_fill((NXWINDOW)fwnd, &intersection, color); nx_fill((NXWINDOW)fwnd, &intersection, color);
} }
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -110,10 +112,14 @@ static void nxtk_drawframeside(FAR struct nxtk_framedwindow_s *fwnd,
int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd,
FAR const struct nxgl_rect_s *bounds) FAR const struct nxgl_rect_s *bounds)
{ {
#if CONFIG_NXTK_BORDERWIDTH > 0
struct nxgl_rect_s frame; struct nxgl_rect_s frame;
#endif
struct nxgl_size_s wndsize; struct nxgl_size_s wndsize;
struct nxgl_size_s tbsize; struct nxgl_size_s tbsize;
#if CONFIG_NXTK_BORDERWIDTH > 0
nxgl_coord_t thickness; nxgl_coord_t thickness;
#endif
/* Shiny edge: /* Shiny edge:
* Thickness: 1 * Thickness: 1
@ -133,7 +139,7 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd,
thickness = CONFIG_NXTK_BORDERWIDTH - 2; thickness = CONFIG_NXTK_BORDERWIDTH - 2;
#elif CONFIG_NXTK_BORDERWIDTH > 1 #elif CONFIG_NXTK_BORDERWIDTH > 1
thickness = CONFIG_NXTK_BORDERWIDTH - 1; thickness = CONFIG_NXTK_BORDERWIDTH - 1;
#else #elif CONFIG_NXTK_BORDERWIDTH > 0
thickness = CONFIG_NXTK_BORDERWIDTH; thickness = CONFIG_NXTK_BORDERWIDTH;
#endif #endif