diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
commit | 43c642c61857ceefe07ce0fb929c569b52a545a5 (patch) | |
tree | 865d4f643ca3024818a963b2d5ff1aceb8c3a9f5 /NxWidgets/libnxwidgets/include | |
parent | 5a5bdf7d1b7afcf5c7b30209bdfad2abf2e72f3b (diff) | |
download | nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.tar.gz nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.tar.bz2 nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.zip |
NxWidgets updates from Petteri Aimonen; buildroot GDB build fix from Ken Bannister
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5592 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
-rw-r--r-- | NxWidgets/libnxwidgets/include/cgraphicsport.hxx | 7 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwidget.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/ctabpanel.hxx | 108 |
3 files changed, 113 insertions, 4 deletions
diff --git a/NxWidgets/libnxwidgets/include/cgraphicsport.hxx b/NxWidgets/libnxwidgets/include/cgraphicsport.hxx index d3d9e6114..006a56d51 100644 --- a/NxWidgets/libnxwidgets/include/cgraphicsport.hxx +++ b/NxWidgets/libnxwidgets/include/cgraphicsport.hxx @@ -123,9 +123,10 @@ namespace NXWidgets * @param background Color to use for background if transparent is false. * @param transparent Whether to fill the background. */ - void drawText(struct nxgl_point_s *pos, CRect *bound, CNxFont *font, - const CNxString &string, int startIndex, int length, - nxgl_mxpixel_t background, bool transparent); + + void _drawText(struct nxgl_point_s *pos, CRect *bound, CNxFont *font, + const CNxString &string, int startIndex, int length, + nxgl_mxpixel_t background, bool transparent); public: /** diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index dda8efc1d..32e3dfbc6 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -222,7 +222,7 @@ namespace NXWidgets * @see redraw(). */ - virtual inline void drawContents(CGraphicsPort* port) { } + virtual void drawContents(CGraphicsPort* port); /** * Draw the area of this widget that falls within the clipping region. diff --git a/NxWidgets/libnxwidgets/include/ctabpanel.hxx b/NxWidgets/libnxwidgets/include/ctabpanel.hxx new file mode 100644 index 000000000..aa6eb20f8 --- /dev/null +++ b/NxWidgets/libnxwidgets/include/ctabpanel.hxx @@ -0,0 +1,108 @@ +/**************************************************************************** + * NxWidgets/libnxwidgets/include/ctabpanel.hxx + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Petteri Aimonen <jpa@kapsi.fi> + * + * 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_CTABPANEL_HXX +#define __INCLUDE_CTABPANEL_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +#include "cnxwidget.hxx" +#include "cwidgetstyle.hxx" +#include "cnxstring.hxx" +#include "tnxarray.hxx" +#include "clatchbuttonarray.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Forward references + */ + + class CWidgetControl; + class CRect; + class CStickyButtonArray; + + /** + * Tab panel, with tabs at the top and a panel at the bottom. + */ + + class CTabPanel : public CNxWidget, public CWidgetEventHandler + { + protected: + TNxArray<CNxWidget*> m_tabpages; + CLatchButtonArray *m_buttonbar; + + virtual void handleActionEvent(const CWidgetEventArgs &e); + + virtual void drawContents(CGraphicsPort* port) {} + virtual void drawBorder(CGraphicsPort* port) {} + + public: + CTabPanel(CWidgetControl *pWidgetControl, uint8_t numPages, + nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, + nxgl_coord_t buttonHeight, + FAR const CWidgetStyle *style = (FAR const CWidgetStyle *)NULL + ); + + inline CNxWidget &page(uint8_t index) { return *m_tabpages.at(index); } + + void setPageName(uint8_t index, const CNxString &name); + + void showPage(uint8_t index); + }; +} + +#endif +#endif |