Add NxWM::CWindowControl; task bar and start window icons now functional

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

5 files changed, 122 insertions, 47 deletions

diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
index e8ce53740..7736a3081 100644
--- a/NxWidgets/nxwm/include/capplicationwindow.hxx
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -49,7 +49,6 @@
 #include "cimage.hxx"
 #include "clabel.hxx"
 #include "crlepalettebitmap.hxx"
-#include "cwindoweventhandler.hxx"
 
 #include "iapplicationwindow.hxx"
 
@@ -72,8 +71,7 @@ namespace NxWM
    */
 
   class CApplicationWindow : public IApplicationWindow,
-                             private NXWidgets::CWidgetEventHandler,
-                             private NXWidgets::CWindowEventHandler
+                             private NXWidgets::CWidgetEventHandler
   {
   protected:
     NXWidgets::CNxTkWindow       *m_window;         /**< The framed window used by the application */
@@ -87,24 +85,6 @@ namespace NxWM
     IApplicationCallback         *m_callback;       /**< Toolbar action callbacks */
 
     /**
-     * Handle an NX window mouse input event.
-     *
-     * @param e The event data.
-     */
-
-#ifdef CONFIG_NX_MOUSE
-    void handleMouseEvent(void);
-#endif
-
-    /**
-     * Handle a NX window keyboard input event.
-     */
-
-#ifdef CONFIG_NX_KBD
-    void handleKeyboardEvent(void);
-#endif
-
-    /**
      * Handle a mouse button click event.
      *
      * @param e The event data.
diff --git a/NxWidgets/nxwm/include/cfullscreenwindow.hxx b/NxWidgets/nxwm/include/cfullscreenwindow.hxx
index 41425bf4c..fb4788830 100644
--- a/NxWidgets/nxwm/include/cfullscreenwindow.hxx
+++ b/NxWidgets/nxwm/include/cfullscreenwindow.hxx
@@ -63,30 +63,11 @@ namespace NxWM
    * for example, to support full screen displays.
    */
 
-  class CFullScreenWindow : public IApplicationWindow,
-                            private NXWidgets::CWindowEventHandler
+  class CFullScreenWindow : public IApplicationWindow
   {
   protected:
     NXWidgets::CNxWindow *m_window; /**< The generic window used by the application */
 
-    /**
-     * Handle an NX window mouse input event.
-     *
-     * @param e The event data.
-     */
-
-#ifdef CONFIG_NX_MOUSE
-    void handleMouseEvent(void);
-#endif
-
-    /**
-     * Handle a NX window keyboard input event.
-     */
-
-#ifdef CONFIG_NX_KBD
-    void handleKeyboardEvent(void);
-#endif
-
   public:
 
     /**
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx
index 226fbdf03..5e4fa7564 100644
--- a/NxWidgets/nxwm/include/cstartwindow.hxx
+++ b/NxWidgets/nxwm/include/cstartwindow.hxx
@@ -61,7 +61,8 @@ namespace NxWM
 {
   class CTaskbar;
 
-  class CStartWindow : public IApplication, private IApplicationCallback,
+  class CStartWindow : public IApplication,
+                       private IApplicationCallback,
                        private NXWidgets::CWidgetEventHandler
   {
   protected:
diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx
index 398087f84..1f2f69580 100644
--- a/NxWidgets/nxwm/include/ctaskbar.hxx
+++ b/NxWidgets/nxwm/include/ctaskbar.hxx
@@ -82,7 +82,8 @@ namespace NxWM
    * (and I may still do that someday)
    */
 
-  class CTaskbar : public  NXWidgets::CNxServer, private NXWidgets::CWidgetEventHandler
+  class CTaskbar : public  NXWidgets::CNxServer,
+                   private NXWidgets::CWidgetEventHandler
   {
   private:
     /**
@@ -109,12 +110,12 @@ namespace NxWM
     /**
      * Create a raw window. 
      *
-     * 1) Create a dumb CWigetControl instance
-     * 2) Pass the dumb CWidgetControl instance to the window constructor
-     *    that inherits from INxWindow.  This will "smarten" the CWidgetControl
+     * 1) Create a dumb CWindowControl instance
+     * 2) Pass the dumb CWindowControl instance to the window constructor
+     *    that inherits from INxWindow.  This will "smarten" the CWindowControl
      *    instance with some window knowlede
      * 3) Call the open() method on the window to display the window.
-     * 4) After that, the fully smartened CWidgetControl instance can
+     * 4) After that, the fully smartened CWindowControl instance can
      *    be used to generate additional widgets by passing it to the
      *    widget constructor
      */
diff --git a/NxWidgets/nxwm/include/cwindowcontrol.hxx b/NxWidgets/nxwm/include/cwindowcontrol.hxx
new file mode 100644
index 000000000..acec12727
--- /dev/null
+++ b/NxWidgets/nxwm/include/cwindowcontrol.hxx
@@ -0,0 +1,112 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/cwindowcontrol.hxx
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
+ *    me be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_CWINDOWCONTROL_HXX
+#define __INCLUDE_CWINDOWCONTROL_HXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <nuttx/nx/nxtk.h>
+#include <nuttx/nx/nxconsole.h>
+
+#include "cwindoweventhandler.hxx"
+#include "cwidgetcontrol.hxx"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Implementation Classes
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  /**
+   * The class CWindowControl integrates the widget control with some special
+   * handling of mouse and keyboard inputs neesed by NxWM
+   */
+
+  class CWindowControl : public NXWidgets::CWidgetControl,
+                         private NXWidgets::CWindowEventHandler
+  {
+  private:
+    /**
+     * Handle an NX window mouse input event.
+     *
+     * @param e The event data.
+     */
+
+#ifdef CONFIG_NX_MOUSE
+    void handleMouseEvent(void);
+#endif
+
+    /**
+     * Handle a NX window keyboard input event.
+     */
+
+#ifdef CONFIG_NX_KBD
+    void handleKeyboardEvent(void);
+#endif
+
+  public:
+
+    /**
+     * Constructor
+     *
+     * @param style The default style that all widgets on this display
+     *   should use.  If this is not specified, the widget will use the
+     *   values stored in the defaultCWidgetStyle object.
+     */
+
+     CWindowControl(FAR const NXWidgets::CWidgetStyle *style = (const NXWidgets::CWidgetStyle *)NULL);
+
+    /**
+     * Destructor.
+     */
+
+    ~CWindowControl(void);
+  };
+}
+#endif // __cplusplus
+
+#endif // __INCLUDE_CWINDOWCONTROL_HXX