more NxWM stuff

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

4 files changed, 213 insertions, 8 deletions

diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx
new file mode 100644
index 000000000..6f802ebe5
--- /dev/null
+++ b/NxWidgets/nxwm/include/capplicationwindow.hxx
@@ -0,0 +1,147 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/capplicationwindow.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_CAPPLICATIONWINDOW_NXX
+#define __INCLUDE_CAPPLICATIONWINDOW_NXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+#include <nuttx/config.h>
+
+#include "cnxtkwindow.hxx"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Abstract Base Classes
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  class CNxtkWindow;
+
+  /**
+   * This callback class is used by the application to get notification of toolbar
+   * related events.
+   */
+
+  class IApplicationCallback
+  {
+  public:
+    /**
+     * Called when the window minimize button is pressed.
+     */
+
+    virtual void minimize(void) = 0;
+
+    /**
+     * Called when the window minimize close is pressed.
+     */
+
+    virtual void close(void) = 0;
+  };
+
+  /**
+   * This class represents that application window.  This class contains that the
+   * framed window and its toolbar.  It manages callbacks from the toolbar minimize
+   * and close buttions and passes these to the application via callbacks.
+   */
+
+  class CApplicationWindow : public INxApplication
+  {
+  protected:
+    NxWidgets::CNxTkWindow *m_window;   /**< The framed window used by the application */
+    NxWidgets::CNxToolbar  *m_toolbar;  /**< The toolbar */
+    NxWidgets::CImage      *m_minimize; /**< The minimize icon */
+    NxWidgets::CImage      *m_close;    /**< The close icon */
+    IApplicationCallback   *m_callback; /**< Toolbar action callbacks */
+
+    /**
+     * CNxApplicationWindow Destructor
+     */
+
+    ~CNxApplicationWindow(void);
+
+  public:
+
+    /**
+     * CNxApplicationWindow Constructor
+     *
+     * @param taskbar.  A pointer to the parent task bar instance
+     * @param window.  The window to be used by this application.
+     */
+
+    CNxApplicationWindow(NxWidgets::CNxTkWindow *window);
+
+    /**
+     * Initialize window.  Window initialization is separate from
+     * object instantiation so that failures can be reported.
+     *
+     * @return True if the window was successfully initialized.
+     */
+
+    bool open(void);
+
+    /**
+     * Recover the contained NXTK window instance
+     *
+     * @return.  The window used by this application
+     */
+
+    inline NxWidgets::CNxTkWindow *getWindow(void) const
+    {
+      return m_window;
+    }
+
+    /**
+     * Register to receive callbacks when toolbar icons are selected
+     */
+
+    void registerCallbacks(IApplicationCallback *callback)
+    {
+      m_callback = callback
+    }
+  };
+}
+
+#endif // __cplusplus
+
+#endif // __INCLUDE_CAPPLICATIONWINDOW_NXX
diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx
index 793a46849..891ac8884 100644
--- a/NxWidgets/nxwm/include/cnxconsole.hxx
+++ b/NxWidgets/nxwm/include/cnxconsole.hxx
@@ -51,19 +51,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Bitmap Glyph References
+ * Implementation Classes
  ****************************************************************************/
 
 #if defined(__cplusplus)
 
 namespace NxWM
 {
-  extern const struct NxWidgets::SRlePaletteBitmap g_nshBitmap;
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
   /**
    * This class implements the NxConsole application.
    */
diff --git a/NxWidgets/nxwm/include/cnxtaskbar.hxx b/NxWidgets/nxwm/include/cnxtaskbar.hxx
index 606514bb0..5f1a81527 100644
--- a/NxWidgets/nxwm/include/cnxtaskbar.hxx
+++ b/NxWidgets/nxwm/include/cnxtaskbar.hxx
@@ -63,7 +63,7 @@ namespace NxWM
   class CNxTaskBar : public  NxWidgets::CNxServer
   {
   private:
-    NxWidgets:INxWindow       *m_toolbar;        /**< The toolbar window */
+    NxWidgets:INxWindow       *m_taskbar;        /**< The toolbar window */
     NxWidgets:INxWindow       *m_background;     /**< The background window */
     INxApplication            *m_start;          /**< The start window */
 
diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx
new file mode 100644
index 000000000..0e58962c9
--- /dev/null
+++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * NxWidgets/nxwm/include/nxwmconfig.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_NXWM_CONFIG_HXX
+#define __INCLUDE_NXWM_CONFIG_HXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+#include <nuttx/config.h>
+
+#include "nxconfig.hxx"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Bitmap Glyphs
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NxWM
+{
+  extern const struct NxWidgets::SRlePaletteBitmap g_nshBitmap;
+  extern const struct NxWidgets::SRlePaletteBitmap g_minimizeBitmap;
+  extern const struct NxWidgets::SRlePaletteBitmap g_stopBitmap;
+
+#endif // __cplusplus
+#endif // __INCLUDE_NXWM_CONFIG_HXX