summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm/include/chexcalculator.hxx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-23 12:53:57 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-23 12:53:57 +0000
commit9ba2d6e08c35300deb8ba98fe67964bc7477c9c6 (patch)
tree4e69c345d70210e8b9a4426b7fd18d6d2dd5a310 /NxWidgets/nxwm/include/chexcalculator.hxx
parentba69f7e7611d2998d783f8224d2d5f8aa10dde58 (diff)
downloadnuttx-9ba2d6e08c35300deb8ba98fe67964bc7477c9c6.tar.gz
nuttx-9ba2d6e08c35300deb8ba98fe67964bc7477c9c6.tar.bz2
nuttx-9ba2d6e08c35300deb8ba98fe67964bc7477c9c6.zip
Various improvements to NxWM hex calculator display
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4767 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/include/chexcalculator.hxx')
-rw-r--r--NxWidgets/nxwm/include/chexcalculator.hxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/NxWidgets/nxwm/include/chexcalculator.hxx b/NxWidgets/nxwm/include/chexcalculator.hxx
index 9f9b61a9b..69ee37624 100644
--- a/NxWidgets/nxwm/include/chexcalculator.hxx
+++ b/NxWidgets/nxwm/include/chexcalculator.hxx
@@ -48,6 +48,7 @@
#include "cbuttonarray.hxx"
#include "clabel.hxx"
+#include "cnxfont.hxx"
#include "iapplication.hxx"
#include "capplicationwindow.hxx"
@@ -104,6 +105,7 @@ namespace NxWM
NXWidgets::CButtonArray *m_keypad; /**< The calculator keyboard */
NXWidgets::CLabel *m_text; /**< The accumulator text display */
+ NXWidgets::CNxFont *m_font; /**< The font used in the calculator */
/**
* Calculator geometry. This stuff does not really have to be retained
@@ -132,6 +134,7 @@ namespace NxWM
struct SPendingOperation m_low; /**< Low precedence pending operation */
struct SPendingOperation m_high; /**< Hight precedence pending operation */
bool m_hexMode; /**< True if in hex mode */
+ bool m_result ; /**< True if the accumulator holds a previoius result */
/**
* Select the geometry of the calculator given the current window size.