summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-22 21:01:42 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-22 21:01:42 +0000
commit91f53fd2a857714c794e0ccc6d8c91c79f41684a (patch)
tree369773a3d67450df5cd2b670c3fcb0b5b501acc2 /NxWidgets/libnxwidgets
parent237d7e4c1c99762ee856d360eb64c3aab453c4bf (diff)
downloadnuttx-91f53fd2a857714c794e0ccc6d8c91c79f41684a.tar.gz
nuttx-91f53fd2a857714c794e0ccc6d8c91c79f41684a.tar.bz2
nuttx-91f53fd2a857714c794e0ccc6d8c91c79f41684a.zip
CHexCalculator fixes + back out change to CNxtkWindow
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4761 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r--NxWidgets/libnxwidgets/src/cnxtkwindow.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx
index b1d7be9e2..05241817c 100644
--- a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx
+++ b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx
@@ -298,15 +298,9 @@ bool CNxTkWindow::getPosition(FAR struct nxgl_point_s *pos)
bool CNxTkWindow::getSize(FAR struct nxgl_size_s *size)
{
// Get the size of the NXTK window (this will exclude the thickness of
- // the frame).
+ // the frame and the height of the toolbar, if any).
- bool ret = m_widgetControl->getWindowSize(size);
-
- // Subtract the height of the toolbar (if any) to get the size of the
- // drawable region in the window.
-
- size->h -= m_toolbarHeight;
- return ret;
+ return m_widgetControl->getWindowSize(size);
}
/**