From 91e38a73cd93af894ecaf44476ae8e6313670cb5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 15 May 2012 16:40:43 +0000 Subject: 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 --- NxWidgets/nxwm/include/capplicationwindow.hxx | 4 ++-- NxWidgets/nxwm/include/cstartwindow.hxx | 4 ++-- NxWidgets/nxwm/include/ctaskbar.hxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'NxWidgets/nxwm/include') 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: /** -- cgit v1.2.3