NxWidgets: New pre-release event. Action now raised on pre-release. NxWM: Use action event to process icon touches; Fix initialization of image highlighted state.

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4740 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 15 insertions, 15 deletions

diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
index 1a3d7eb48..8eda8d28a 100644
--- a/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -96,12 +96,12 @@ namespace NxWM
     uint8_t                       m_flags;          /**< Window flags */
 
     /**
-     * Handle a mouse button click event.
+     * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
      *
      * @param e The event data.
      */
 
-    void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
+    void handleActionEvent(const NXWidgets::CWidgetEventArgs &e);
 
   public:
 
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx
index 5a5ea12f4..d0ae5ec84 100644
--- a/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/NxWidgets/nxwm/include/cstartwindow.hxx
@@ -110,12 +110,12 @@ namespace NxWM
     void stopAllApplications(void);
 
     /**
-     * Handle a mouse button click event.
+     * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
      *
      * @param e The event data.
      */
 
-    void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
+    void handleActionEvent(const NXWidgets::CWidgetEventArgs &e);
 
   public:
 
diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx
index 35a291aef..cf98d10d9 100644
--- a/NxWidgets/nxwm/include/ctaskbar.hxx
+++ b/NxWidgets/nxwm/include/ctaskbar.hxx
@@ -209,12 +209,12 @@ namespace NxWM
     void hideApplicationWindow(IApplication *app);
 
     /**
-     * Handle a mouse button click event.
+     * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
      *
      * @param e The event data.
      */
 
-    void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
+    void handleActionEvent(const NXWidgets::CWidgetEventArgs &e);
 
   public:
     /**
diff --git a/NxWidgets/nxwm/src/capplicationwindow.cxx b/NxWidgets/nxwm/src/capplicationwindow.cxx
index 320559ef7..df8c69f11 100644
--- a/NxWidgets/nxwm/src/capplicationwindow.cxx
+++ b/NxWidgets/nxwm/src/capplicationwindow.cxx
@@ -498,12 +498,12 @@ void CApplicationWindow::clickStopIcon(int index)
 #endif
 
 /**
- * Handle a mouse button click event.
+ * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
  *
  * @param e The event data.
  */
 
-void CApplicationWindow::handleClickEvent(const NXWidgets::CWidgetEventArgs &e)
+void CApplicationWindow::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
 {
   // Ignore the event if no callback is registered
 
diff --git a/NxWidgets/nxwm/src/cstartwindow.cxx b/NxWidgets/nxwm/src/cstartwindow.cxx
index ceeff0d7b..de35662d5 100644
--- a/NxWidgets/nxwm/src/cstartwindow.cxx
+++ b/NxWidgets/nxwm/src/cstartwindow.cxx
@@ -36,7 +36,7 @@
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
- 
+
 #include <nuttx/config.h>
 
 #include "cwidgetcontrol.hxx"
@@ -443,14 +443,14 @@ void CStartWindow::stopAllApplications(void)
 }
 
 /**
- * Handle a mouse button click event.
+ * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
  *
  * @param e The event data.
  */
 
-void CStartWindow::handleClickEvent(const NXWidgets::CWidgetEventArgs &e)
+void CStartWindow::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
 {
-  // icon was clicked?
+  // Was an ICON clicked?
 
   for (int i = 0; i < m_slots.size(); i++)
     {
diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx
index b15916b0a..ec3d8460b 100644
--- a/NxWidgets/nxwm/src/ctaskbar.cxx
+++ b/NxWidgets/nxwm/src/ctaskbar.cxx
@@ -1277,14 +1277,14 @@ void CTaskbar::hideApplicationWindow(IApplication *app)
 }
 
 /**
- * Handle a mouse button click event.
+ * Handle a widget action event.  For CImage, this is a mouse button pre-release event.
  *
  * @param e The event data.
  */
 
-void CTaskbar::handleClickEvent(const NXWidgets::CWidgetEventArgs &e)
+void CTaskbar::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
 {
-  // icon was clicked?
+  // Was a n ICON clicked?
 
   for (int i = 0; i < m_slots.size(); i++)
     {