diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-10 01:35:23 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-10 01:35:23 +0000 |
| commit | 2bfda8161a877d7e618a37353f806981c0ab4a4b (patch) | |
| tree | ed24ca0b53d7c523a4d09b961329fd081234457e /NxWidgets/nxwm | |
| parent | 6b32872462ba7e069df10760d89806a9ae895006 (diff) | |
| download | nuttx-2bfda8161a877d7e618a37353f806981c0ab4a4b.tar.gz nuttx-2bfda8161a877d7e618a37353f806981c0ab4a4b.tar.bz2 nuttx-2bfda8161a877d7e618a37353f806981c0ab4a4b.zip | |
More NxWM touchscreen fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4719 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm')
| -rw-r--r-- | NxWidgets/nxwm/include/ccalibration.hxx | 10 | ||||
| -rw-r--r-- | NxWidgets/nxwm/include/ctouchscreen.hxx | 5 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ccalibration.cxx | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/NxWidgets/nxwm/include/ccalibration.hxx b/NxWidgets/nxwm/include/ccalibration.hxx index 9ca5b7589..0adcd894f 100644 --- a/NxWidgets/nxwm/include/ccalibration.hxx +++ b/NxWidgets/nxwm/include/ccalibration.hxx @@ -89,7 +89,7 @@ namespace NxWM * callibration data. */ - class CCalibration : public IApplication, private NXWidgets::CWidgetEventHandler + class CCalibration : public IApplication { private: /** @@ -147,14 +147,6 @@ namespace NxWM void stateMachine(void); /** - * Handle a mouse button click event. - * - * @param e The event data. - */ - - void handleClickEvent(const NXWidgets::CWidgetEventArgs &e); - - /** * Presents the next calibration screen */ diff --git a/NxWidgets/nxwm/include/ctouchscreen.hxx b/NxWidgets/nxwm/include/ctouchscreen.hxx index 31c61623b..f8eaeaee8 100644 --- a/NxWidgets/nxwm/include/ctouchscreen.hxx +++ b/NxWidgets/nxwm/include/ctouchscreen.hxx @@ -45,9 +45,6 @@ #include <semaphore.h> #include <nuttx/input/touchscreen.h> -#include "cwidgeteventhandler.hxx" -#include "iapplication.hxx" - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -63,7 +60,7 @@ namespace NxWM * callibration data. */ - class CTouchscreen : public IApplication, private NXWidgets::CWidgetEventHandler + class CTouchscreen { private: int m_touchFd; /**< File descriptor of the opened touchscreen device */ diff --git a/NxWidgets/nxwm/src/ccalibration.cxx b/NxWidgets/nxwm/src/ccalibration.cxx index 2ca132dac..e218b5f1e 100644 --- a/NxWidgets/nxwm/src/ccalibration.cxx +++ b/NxWidgets/nxwm/src/ccalibration.cxx @@ -156,7 +156,7 @@ bool CCalibration::run(void) // Loop until calibration completes - while (!m_stop) + while (!m_stop && m_state != CALIB_COMPLETE) { // Wait for the next raw touchscreen input |