More NxWM support

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

1 files changed, 30 insertions, 17 deletions

diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx
index 1de4a7491..f5bef2054 100644
--- a/NxWidgets/nxwm/include/ctaskbar.hxx
+++ b/NxWidgets/nxwm/include/ctaskbar.hxx
@@ -101,18 +101,6 @@ namespace NxWM
     TNxArray<struct STaskbarSlot> m_slots;      /**< List of application slots in the task bar */
 
     /**
-     * Connect to the server
-     */
- 
-    bool connect(void);
-
-    /**
-     * Disconnect from the server
-     */
-
-    void disconnect(void);
-
-    /**
      * Create a raw window. 
      *
      * 1) Create a dumb CWigetControl instance
@@ -202,20 +190,32 @@ namespace NxWM
 
     void handleClickEvent(const NXWidgets::CWidgetEventArgs &e);
 
+  public:
+    /**
+     * CTaskbar Constructor
+     *
+     * @param hWnd - NX server handle
+     */
+
+    CTaskbar(void);
+
     /**
      * CTaskbar Destructor
      */
 
     ~CTaskbar(void);
 
-  public:
     /**
-     * CTaskbar Constructor
-     *
-     * @param hWnd - NX server handle
+     * Connect to the server
      */
+ 
+    bool connect(void);
 
-    CTaskbar(void);
+    /**
+     * Disconnect from the server
+     */
+
+    void disconnect(void);
 
     /**
      * Initialize task bar.  Task bar initialization is separate from
@@ -341,6 +341,19 @@ namespace NxWM
      */
 
     bool stopApplication(IApplication *app);
+
+    /**
+     * Simulate a mouse click on the icon at index.  This inline method is only
+     * used duringautomated testing of NxWM.
+     */
+
+    inline void clickIcon(int index)
+    {
+      if (index < m_slots.size())
+       {
+         m_slots.at(index).image->click(0,0);
+       }
+    }
   };
 }