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