Add a 320x320 NuttX logo image

2 files changed, 138 insertions, 131 deletions

diff --git a/NxWidgets/libnxwidgets/include/ctext.hxx b/NxWidgets/libnxwidgets/include/ctext.hxx
index 8f8ee5783..a58d32eeb 100644
--- a/NxWidgets/libnxwidgets/include/ctext.hxx
+++ b/NxWidgets/libnxwidgets/include/ctext.hxx
@@ -147,6 +147,12 @@ namespace NXWidgets
     CText(CNxFont *font, const CNxString &text, nxgl_coord_t width);
 
     /**
+     * Destructor.
+     */
+
+    virtual ~CText(void) {}
+
+    /**
      * Set the text in the string.
      *
      * @param text Char array to use as the new data for this string.
diff --git a/NxWidgets/libnxwidgets/include/glyphs.hxx b/NxWidgets/libnxwidgets/include/glyphs.hxx
index afd6cc7a0..230db8ff6 100644
--- a/NxWidgets/libnxwidgets/include/glyphs.hxx
+++ b/NxWidgets/libnxwidgets/include/glyphs.hxx
@@ -1,131 +1,132 @@
-/****************************************************************************

- * NxWidgets/libnxwidgets/include/glyphs.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.

- *

- ****************************************************************************

- *

- * Portions of this package derive from Woopsi (http://woopsi.org/) and

- * portions are original efforts.  It is difficult to determine at this

- * point what parts are original efforts and which parts derive from Woopsi.

- * However, in any event, the work of  Antony Dzeryn will be acknowledged

- * in most NxWidget files.  Thanks Antony!

- *

- *   Copyright (c) 2007-2011, Antony Dzeryn

- *   All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * * Redistributions of source code must retain the above copyright

- *   notice, this list of conditions and the following disclaimer.

- * * 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.

- * * Neither the names "Woopsi", "Simian Zombie" nor the

- *   names of its contributors may be used to endorse or promote products

- *   derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY Antony Dzeryn ``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 Antony Dzeryn 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_GLYPHS_HXX

-#define __INCLUDE_GLYPHS_HXX

-

-/****************************************************************************

- * Included Files

- ****************************************************************************/

- 

-#include <nuttx/config.h>

-

-#include <stdint.h>

-#include <stdbool.h>

-

-#include <nuttx/nx/nxglib.h>

-

-/****************************************************************************

- * Pre-Processor Definitions

- ****************************************************************************/

-

-/****************************************************************************

- * Bitmap Glyph References

- ****************************************************************************/

-

-#if defined(__cplusplus)

-

-namespace NXWidgets

-{

-  struct SBitmap;

-

-  // Global RLE Paletted Bitmaps

-

-  extern const struct SRlePaletteBitmap g_nuttxBitmap;

-

-  // Global Simple Bitmaps

-

-  extern const struct SBitmap g_screenDepthUp;

-  extern const struct SBitmap g_screenDepthDown;

-  extern const struct SBitmap g_windowClose;

-  extern const struct SBitmap g_windowDepthUp;

-  extern const struct SBitmap g_windowDepthDown;

-  extern const struct SBitmap g_radioButtonOn;

-  extern const struct SBitmap g_radioButtonOff;

-  extern const struct SBitmap g_radioButtonMu;

-  extern const struct SBitmap g_checkBoxOff;

-  extern const struct SBitmap g_checkBoxOn;

-  extern const struct SBitmap g_checkBoxMu;

-  extern const struct SBitmap g_screenFlipUp;

-  extern const struct SBitmap g_screenFlipDown;

-  extern const struct SBitmap g_arrowUp;

-  extern const struct SBitmap g_arrowDown;

-  extern const struct SBitmap g_arrowLeft;

-  extern const struct SBitmap g_arrowRight;

-  extern const struct SBitmap g_cycle;

-  extern const struct SBitmap g_backspace;

-  extern const struct SBitmap g_return;

-  extern const struct SBitmap g_shift;

-  extern const struct SBitmap g_capslock;

-  extern const struct SBitmap g_control;

-}

-

-#endif // __cplusplus

-

-#endif // __INCLUDE_GLYPHS_HXX

+/****************************************************************************
+ * NxWidgets/libnxwidgets/include/glyphs.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.
+ *
+ ****************************************************************************
+ *
+ * Portions of this package derive from Woopsi (http://woopsi.org/) and
+ * portions are original efforts.  It is difficult to determine at this
+ * point what parts are original efforts and which parts derive from Woopsi.
+ * However, in any event, the work of  Antony Dzeryn will be acknowledged
+ * in most NxWidget files.  Thanks Antony!
+ *
+ *   Copyright (c) 2007-2011, Antony Dzeryn
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the names "Woopsi", "Simian Zombie" nor the
+ *   names of its contributors may be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Antony Dzeryn ``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 Antony Dzeryn 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_GLYPHS_HXX
+#define __INCLUDE_GLYPHS_HXX
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+ 
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <nuttx/nx/nxglib.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Bitmap Glyph References
+ ****************************************************************************/
+
+#if defined(__cplusplus)
+
+namespace NXWidgets
+{
+  struct SBitmap;
+
+  // Global RLE Paletted Bitmaps
+
+  extern const struct SRlePaletteBitmap g_nuttxBitmap160x160;
+  extern const struct SRlePaletteBitmap g_nuttxBitmap320x320;
+
+  // Global Simple Bitmaps
+
+  extern const struct SBitmap g_screenDepthUp;
+  extern const struct SBitmap g_screenDepthDown;
+  extern const struct SBitmap g_windowClose;
+  extern const struct SBitmap g_windowDepthUp;
+  extern const struct SBitmap g_windowDepthDown;
+  extern const struct SBitmap g_radioButtonOn;
+  extern const struct SBitmap g_radioButtonOff;
+  extern const struct SBitmap g_radioButtonMu;
+  extern const struct SBitmap g_checkBoxOff;
+  extern const struct SBitmap g_checkBoxOn;
+  extern const struct SBitmap g_checkBoxMu;
+  extern const struct SBitmap g_screenFlipUp;
+  extern const struct SBitmap g_screenFlipDown;
+  extern const struct SBitmap g_arrowUp;
+  extern const struct SBitmap g_arrowDown;
+  extern const struct SBitmap g_arrowLeft;
+  extern const struct SBitmap g_arrowRight;
+  extern const struct SBitmap g_cycle;
+  extern const struct SBitmap g_backspace;
+  extern const struct SBitmap g_return;
+  extern const struct SBitmap g_shift;
+  extern const struct SBitmap g_capslock;
+  extern const struct SBitmap g_control;
+}
+
+#endif // __cplusplus
+
+#endif // __INCLUDE_GLYPHS_HXX