diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-02 22:03:05 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-02 22:03:05 +0000 |
| commit | 2b6180f48e080cc0c1dc8ed851df07c4f02f9310 (patch) | |
| tree | 8773aca5097c9c4fd1006bf1e35685c55619ce17 /nuttx/graphics/nxtk | |
| parent | 882448de92cd793aa01c2a4d585d02306411e7ed (diff) | |
| download | px4-firmware-2b6180f48e080cc0c1dc8ed851df07c4f02f9310.tar.gz px4-firmware-2b6180f48e080cc0c1dc8ed851df07c4f02f9310.tar.bz2 px4-firmware-2b6180f48e080cc0c1dc8ed851df07c4f02f9310.zip | |
NxWM updates (with some NX and NxWidget fixes too)
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4689 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/graphics/nxtk')
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index 6a2063a26..50bd5aff4 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxtk/nxtk_bitmaptoolbar.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -122,7 +122,7 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, * Temporarily, position the origin in absolute screen coordinates */ - nxgl_vectoradd(&wndorigin, origin, &fwnd->fwrect.pt1); + nxgl_vectoradd(&wndorigin, origin, &fwnd->tbrect.pt1); /* Then move the origin so that is relative to the containing window, not the * client subwindow @@ -132,6 +132,6 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, /* Then copy the bitmap */ - nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, origin, stride); + nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, &wndorigin, stride); return OK; } |