apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-07-06 20:00:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

This commit moves the NxWidgets include directories into the correct position in the apps/ source tree.

Browse Source 
Squashed commit of the following:

    Clean-up some include path problems introduced with the previous set of changes.

    app/include/graphics, apps/NxWidgets/UnitTests:  Update include paths for file in new location.

    apps/NxWidgets/nxwidgets and nxwm:  Update include paths for file in new location.

    apps/graphics/NxWidgets:  Move nxwidgets and nxwm include/ directories to apps/include/graphics
This commit is contained in:
Gregory Nutt 2018-09-16 17:23:45 -06:00
parent 2a19aab1a5
commit c558fce8ad
281 changed files with 1293 additions and 1522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/NxWidgets/Doxygen/Doxyfile
View File

@ -574,7 +574,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = "../libnxwidgets" "../nxwm" INPUT = "../nxwidgets" "../nxwm"
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

4
graphics/NxWidgets/README.txt
View File

@ -59,7 +59,7 @@ Kconfig
When copied to that location, it will be used by the NuttX configuration When copied to that location, it will be used by the NuttX configuration
systems to configure settings for NxWidgets and NxWM systems to configure settings for NxWidgets and NxWM
libnxwidgets nxwidgets
The source code, header files, and build environment for NxWidgets is The source code, header files, and build environment for NxWidgets is
provided in this directory. provided in this directory.
@ -67,7 +67,7 @@ libnxwidgets
UnitTests UnitTests
Provides a collection of unit-level tests for many of the individual Provides a collection of unit-level tests for many of the individual
widgets provided by libnxwidgets. widgets provided by nxwidgets.
nxwm nxwm

11
graphics/NxWidgets/UnitTests/CButton/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CButton unit test # CButton unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CButton/cbutton_main.cxx
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cbuttontest.hxx" #include "nxwidgets/cbuttontest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CButton/cbuttontest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbuttontest.hxx" #include "nxwidgets/cbuttontest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CButton/cbuttontest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cbutton.hxx" #include "nxwidgets/cbutton.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CButtonArray/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CButtonArray unit test # CButtonArray unit test
ASRCS = ASRCS =

4
graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
View File

@ -47,8 +47,8 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cbuttonarraytest.hxx" #include "nxwidgets/cbuttonarraytest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbuttonarraytest.hxx" #include "nxwidgets/cbuttonarraytest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cbuttonarray.hxx" #include "nxwidgets/cbuttonarray.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CCheckBox/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CCheckBox unit test # CCheckBox unit test
ASRCS = ASRCS =

6
graphics/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
View File

@ -48,9 +48,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "crlepalettebitmap.hxx" #include "nxwidgets/crlepalettebitmap.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
#include "ccheckboxtest.hxx" #include "nxwidgets/ccheckboxtest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

10
graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
View File

@ -47,11 +47,11 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "ccheckboxtest.hxx" #include "nxwidgets/ccheckboxtest.hxx"
#include "cbitmap.hxx" #include "nxwidgets/cbitmap.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "ccheckbox.hxx" #include "nxwidgets/ccheckbox.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CGlyphButton/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CGlyphButton unit test # CGlyphButton unit test
ASRCS = ASRCS =

4
graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
View File

@ -48,8 +48,8 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cglyphbuttontest.hxx" #include "nxwidgets/cglyphbuttontest.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cglyphbuttontest.hxx" #include "nxwidgets/cglyphbuttontest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

18
graphics/NxWidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
View File

@ -49,15 +49,15 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cglyphbutton.hxx" #include "nxwidgets/cglyphbutton.hxx"
#include "cbitmap.hxx" #include "nxwidgets/cbitmap.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CGlyphSliderHorizontal unit test # CGlyphSliderHorizontal unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cglyphsliderhorizontaltest.hxx" #include "nxwidgets/cglyphsliderhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

8
graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
View File

@ -47,10 +47,10 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "crlepalettebitmap.hxx" #include "nxwidgets/crlepalettebitmap.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cglyphsliderhorizontaltest.hxx" #include "nxwidgets/cglyphsliderhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cglyphsliderhorizontal.hxx" #include "nxwidgets/cglyphsliderhorizontal.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CImage/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CImage unit test # CImage unit test
ASRCS = ASRCS =

6
graphics/NxWidgets/UnitTests/CImage/cimage_main.cxx
View File

@ -48,9 +48,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "crlepalettebitmap.hxx" #include "nxwidgets/crlepalettebitmap.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
#include "cimagetest.hxx" #include "nxwidgets/cimagetest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

8
graphics/NxWidgets/UnitTests/CImage/cimagetest.cxx
View File

@ -47,10 +47,10 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "ibitmap.hxx" #include "nxwidgets/ibitmap.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cimagetest.hxx" #include "nxwidgets/cimagetest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CImage/cimagetest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cimage.hxx" #include "nxwidgets/cimage.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CKeypad/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CKeyPad unit test # CKeyPad unit test
ASRCS = ASRCS =

4
graphics/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
View File

@ -47,8 +47,8 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "ckeypadtest.hxx" #include "nxwidgets/ckeypadtest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx
View File

@ -47,12 +47,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "ckeypadtest.hxx" #include "nxwidgets/ckeypadtest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "crect.hxx" #include "nxwidgets/crect.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

18
graphics/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
View File

@ -49,15 +49,15 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "ctextbox.hxx" #include "nxwidgets/ctextbox.hxx"
#include "ckeypad.hxx" #include "nxwidgets/ckeypad.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CLabel/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CLabel unit test # CLabel unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CLabel/clabel_main.cxx
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "clabeltest.hxx" #include "nxwidgets/clabeltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CLabel/clabeltest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "clabeltest.hxx" #include "nxwidgets/clabeltest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CLabel/clabeltest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "clabel.hxx" #include "nxwidgets/clabel.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CLatchButton/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CLatchButton unit test # CLatchButton unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "clatchbuttontest.hxx" #include "nxwidgets/clatchbuttontest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "clatchbuttontest.hxx" #include "nxwidgets/clatchbuttontest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "clatchbutton.hxx" #include "nxwidgets/clatchbutton.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CLatchButtonArray/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CLatchButtonArray unit test # CLatchButtonArray unit test
ASRCS = ASRCS =

4
graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
View File

@ -47,8 +47,8 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "clatchbuttonarraytest.hxx" #include "nxwidgets/clatchbuttonarraytest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "clatchbuttonarraytest.hxx" #include "nxwidgets/clatchbuttonarraytest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "clatchbuttonarray.hxx" #include "nxwidgets/clatchbuttonarray.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CListBox/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CListBox unit test # CListBox unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "clistboxtest.hxx" #include "nxwidgets/clistboxtest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CListBox/clistboxtest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "clistboxtest.hxx" #include "nxwidgets/clistboxtest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CListBox/clistboxtest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "clistbox.hxx" #include "nxwidgets/clistbox.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CProgressBar/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CProgressBar unit test # CProgressBar unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cprogressbartest.hxx" #include "nxwidgets/cprogressbartest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cprogressbartest.hxx" #include "nxwidgets/cprogressbartest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CProgressBar/cprogressbartest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cprogressbar.hxx" #include "nxwidgets/cprogressbar.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CRadioButton/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CRadioButton unit test # CRadioButton unit test
ASRCS = ASRCS =

6
graphics/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
View File

@ -48,9 +48,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "crlepalettebitmap.hxx" #include "nxwidgets/crlepalettebitmap.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
#include "cradiobuttontest.hxx" #include "nxwidgets/cradiobuttontest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

10
graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
View File

@ -47,11 +47,11 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cradiobuttontest.hxx" #include "nxwidgets/cradiobuttontest.hxx"
#include "cbitmap.hxx" #include "nxwidgets/cbitmap.hxx"
#include "glyphs.hxx" #include "nxwidgets/glyphs.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

14
graphics/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
View File

@ -49,13 +49,13 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cradiobutton.hxx" #include "nxwidgets/cradiobutton.hxx"
#include "cradiobuttongroup.hxx" #include "nxwidgets/cradiobuttongroup.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CScrollbarHorizontal unit test # CScrollbarHorizontal unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cscrollbarhorizontaltest.hxx" #include "nxwidgets/cscrollbarhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cscrollbarhorizontaltest.hxx" #include "nxwidgets/cscrollbarhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cscrollbarhorizontal.hxx" #include "nxwidgets/cscrollbarhorizontal.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CScrollbarVertical/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CScrollbarVertical unit test # CScrollbarVertical unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "cscrollbarverticaltest.hxx" #include "nxwidgets/cscrollbarverticaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cscrollbarverticaltest.hxx" #include "nxwidgets/cscrollbarverticaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cscrollbarvertical.hxx" #include "nxwidgets/cscrollbarvertical.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CSliderHorizonal/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CSliderHorizontal unit test # CSliderHorizontal unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "csliderhorizontaltest.hxx" #include "nxwidgets/csliderhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
View File

@ -47,9 +47,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "csliderhorizontaltest.hxx" #include "nxwidgets/csliderhorizontaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "csliderhorizontal.hxx" #include "nxwidgets/csliderhorizontal.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CSliderVertical/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CSliderVertical unit test # CSliderVertical unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "csliderverticaltest.hxx" #include "nxwidgets/csliderverticaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
View File

@ -48,9 +48,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "csliderverticaltest.hxx" #include "nxwidgets/csliderverticaltest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

12
graphics/NxWidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
View File

@ -49,12 +49,12 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cslidervertical.hxx" #include "nxwidgets/cslidervertical.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

11
graphics/NxWidgets/UnitTests/CTextBox/Makefile
View File

@ -35,17 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
endif
# CTextBox unit test # CTextBox unit test
ASRCS = ASRCS =

2
graphics/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "ctextboxtest.hxx" #include "nxwidgets/ctextboxtest.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

6
graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.cxx
View File

@ -48,9 +48,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "ctextboxtest.hxx" #include "nxwidgets/ctextboxtest.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

16
graphics/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
View File

@ -49,14 +49,14 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include "nxconfig.hxx" #include "nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "nxwidgets/ccallback.hxx"
#include "cbgwindow.hxx" #include "nxwidgets/cbgwindow.hxx"
#include "cnxserver.hxx" #include "nxwidgets/cnxserver.hxx"
#include "cnxfont.hxx" #include "nxwidgets/cnxfont.hxx"
#include "cnxstring.hxx" #include "nxwidgets/cnxstring.hxx"
#include "ctextbox.hxx" #include "nxwidgets/ctextbox.hxx"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Definitions // Definitions

18
graphics/NxWidgets/UnitTests/nxwm/Makefile
View File

@ -35,24 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETS_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)libnxwidgets"
NXWIDGETS_INC = "$(NXWIDGETS_DIR)$(DELIM)include"
NXWM_DIR = "$(APPDIR)$(DELIM)graphics$(DELIM)NxWidgets$(DELIM)nxwm"
NXWM_INC = "$(NXWM_DIR)$(DELIM)include"
ifeq ($(WINTOOL),y)
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWM_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWM_INC)"}
else
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"}
CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWM_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"}
CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWM_INC)"}
endif
# NxWM unit test # NxWM unit test
ASRCS = ASRCS =

16
graphics/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
View File

@ -53,26 +53,26 @@
# include "platform/cxxinitialize.h" # include "platform/cxxinitialize.h"
#endif #endif
#include "ctaskbar.hxx" #include "graphics/nxwm/ctaskbar.hxx"
#include "cstartwindow.hxx" #include "graphics/nxwm/cstartwindow.hxx"
#ifdef CONFIG_NXWM_NXTERM #ifdef CONFIG_NXWM_NXTERM
# include "cnxterm.hxx" # include "graphics/nxwm/cnxterm.hxx"
#endif #endif
#include "chexcalculator.hxx" #include "graphics/nxwm/chexcalculator.hxx"
#ifdef CONFIG_NXWM_MEDIAPLAYER #ifdef CONFIG_NXWM_MEDIAPLAYER
# include "cmediaplayer.hxx" # include "graphics/nxwm/cmediaplayer.hxx"
#endif #endif
#ifdef CONFIG_NXWM_TOUCHSCREEN #ifdef CONFIG_NXWM_TOUCHSCREEN
# include "ctouchscreen.hxx" # include "graphics/nxwm/ctouchscreen.hxx"
# include "ccalibration.hxx" # include "graphics/nxwm/ccalibration.hxx"
#endif #endif
#ifdef CONFIG_NXWM_KEYBOARD #ifdef CONFIG_NXWM_KEYBOARD
# include "ckeyboard.hxx" # include "graphics/nxwm/ckeyboard.hxx"
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

0
graphics/NxWidgets/libnxwidgets/.gitignore → graphics/NxWidgets/nxwidgets/.gitignore vendored
View File

0
graphics/NxWidgets/libnxwidgets/COPYING → graphics/NxWidgets/nxwidgets/COPYING
View File

0
graphics/NxWidgets/libnxwidgets/Kconfig → graphics/NxWidgets/nxwidgets/Kconfig
View File

4
graphics/NxWidgets/libnxwidgets/Make.defs → graphics/NxWidgets/nxwidgets/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/graphics/NxWidgets/libnxwidgets/Make.defs # apps/graphics/NxWidgets/nxwidgets/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) Gregory Nutt. All rights reserved. # Copyright (C) Gregory Nutt. All rights reserved.
@ -35,6 +35,6 @@
############################################################################ ############################################################################
ifeq ($(CONFIG_NXWIDGETS),y) ifeq ($(CONFIG_NXWIDGETS),y)
CONFIGURED_APPS += graphics/NxWidgets/libnxwidgets CONFIGURED_APPS += graphics/NxWidgets/nxwidgets
endif endif

7
graphics/NxWidgets/libnxwidgets/Makefile → graphics/NxWidgets/nxwidgets/Makefile
View File

@ -1,5 +1,5 @@
################################################################################# #################################################################################
# appx/graphics/NxWidgets/libnxwidgets/Makefile # appx/graphics/NxWidgets/nxwidgets/Makefile
# #
# Copyright (C) 2012-2014, 2018 Gregory Nutt. All rights reserved. # Copyright (C) 2012-2014, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
@ -35,8 +35,6 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
NXWIDGETDIR := ${shell pwd | sed -e 's/ /\\ /g'}
ASRCS = ASRCS =
CSRCS = CSRCS =
@ -75,9 +73,6 @@ CXXSRCS += glyph_capslock.cxx glyph_radiobuttonon.cxx glyph_windowdepthdown.cxx
CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx
CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
VPATH = src VPATH = src
include $(APPDIR)/Application.mk include $(APPDIR)/Application.mk

0
graphics/NxWidgets/libnxwidgets/doc/mainpage.h → graphics/NxWidgets/nxwidgets/doc/mainpage.h
View File

8
graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx → graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cbgwindow.cxx * apps/graphics/NxWidgets/nxwidgets/src/cbgwindow.cxx
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,9 +42,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "cbgwindow.hxx" #include "graphics/nxwidgets/cbgwindow.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

4
graphics/NxWidgets/libnxwidgets/src/cbitmap.cxx → graphics/NxWidgets/nxwidgets/src/cbitmap.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cbitmap.hxx * apps/graphics/NxWidgets/nxwidgets/src/cbitmap.hxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

6
graphics/NxWidgets/libnxwidgets/src/cbutton.cxx → graphics/NxWidgets/nxwidgets/src/cbutton.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cbutton.cxx * apps/graphics/NxWidgets/nxwidgets/src/cbutton.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,8 +79,8 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cbutton.hxx" #include "graphics/nxwidgets/cbutton.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

8
graphics/NxWidgets/libnxwidgets/src/cbuttonarray.cxx → graphics/NxWidgets/nxwidgets/src/cbuttonarray.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/include/cbuttonarray.cxx * apps/graphics/NxWidgets/nxwidgets/include/cbuttonarray.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,9 +44,9 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cbuttonarray.hxx" #include "graphics/nxwidgets/cbuttonarray.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cwidgetstyle.hxx" #include "graphics/nxwidgets/cwidgetstyle.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

6
graphics/NxWidgets/libnxwidgets/src/ccallback.cxx → graphics/NxWidgets/nxwidgets/src/ccallback.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/ccallback.cxx * apps/graphics/NxWidgets/nxwidgets/src/ccallback.cxx
* *
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -48,8 +48,8 @@
# include <nuttx/nx/nxterm.h> # include <nuttx/nx/nxterm.h>
#endif #endif
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "ccallback.hxx" #include "graphics/nxwidgets/ccallback.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

16
graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx → graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/ccheckbox.cxx * apps/graphics/NxWidgets/nxwidgets/src/ccheckbox.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -76,13 +76,13 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "nxconfig.hxx" #include "graphics/nxwidgets/nxconfig.hxx"
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "ccheckbox.hxx" #include "graphics/nxwidgets/ccheckbox.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
#include "singletons.hxx" #include "graphics/nxwidgets/singletons.hxx"
#include "glyphs.hxx" #include "graphics/nxwidgets/glyphs.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

10
graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx → graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/ccyclebutton.cxx * apps/graphics/NxWidgets/nxwidgets/src/ccyclebutton.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,10 +79,10 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "ccyclebutton.hxx" #include "graphics/nxwidgets/ccyclebutton.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
#include "glyphs.hxx" #include "graphics/nxwidgets/glyphs.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

12
graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx → graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cglyphbutton.cxx * apps/graphics/NxWidgets/nxwidgets/src/cglyphbutton.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,11 +79,11 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxconfig.hxx" #include "graphics/nxwidgets/nxconfig.hxx"
#include "cglyphbutton.hxx" #include "graphics/nxwidgets/cglyphbutton.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
#include "singletons.hxx" #include "graphics/nxwidgets/singletons.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

14
graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx → graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontal.cxx
* *
* Copyright (C) 2013 Ken Pettit. All rights reserved. * Copyright (C) 2013 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com> * Author: Ken Pettit <pettitkd@gmail.com>
@ -79,12 +79,12 @@
#include <cstdint> #include <cstdint>
#include <cstdbool> #include <cstdbool>
#include "ibitmap.hxx" #include "graphics/nxwidgets/ibitmap.hxx"
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "cglyphsliderhorizontal.hxx" #include "graphics/nxwidgets/cglyphsliderhorizontal.hxx"
#include "cglyphsliderhorizontalgrip.hxx" #include "graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx"
#include "cimage.hxx" #include "graphics/nxwidgets/cimage.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

6
graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx → graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx * apps/graphics/NxWidgets/nxwidgets/src/cglyphsliderhorizontalgrip.cxx
* *
* Copyright (C) 2013 Ken Pettit. All rights reserved. * Copyright (C) 2013 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com> * Author: Ken Pettit <pettitkd@gmail.com>
@ -73,8 +73,8 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include "cglyphsliderhorizontalgrip.hxx" #include "graphics/nxwidgets/cglyphsliderhorizontalgrip.hxx"
#include "ibitmap.hxx" #include "graphics/nxwidgets/ibitmap.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

20
graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx → graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/cgraphicsport.cxx * apps/graphics/NxWidgets/nxwidgets/src/cgraphicsport.cxx
* *
* Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -82,15 +82,15 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include <nuttx/video/rgbcolors.h> #include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx" #include "graphics/nxwidgets/nxconfig.hxx"
#include "inxwindow.hxx" #include "graphics/nxwidgets/inxwindow.hxx"
#include "cnxstring.hxx" #include "graphics/nxwidgets/cnxstring.hxx"
#include "crect.hxx" #include "graphics/nxwidgets/crect.hxx"
#include "cnxfont.hxx" #include "graphics/nxwidgets/cnxfont.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cwidgetstyle.hxx" #include "graphics/nxwidgets/cwidgetstyle.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
#include "singletons.hxx" #include "graphics/nxwidgets/singletons.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

12
graphics/NxWidgets/libnxwidgets/src/cimage.cxx → graphics/NxWidgets/nxwidgets/src/cimage.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/include/cimage.cxx * apps/graphics/NxWidgets/nxwidgets/include/cimage.cxx
* *
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,11 +79,11 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxconfig.hxx" #include "graphics/nxwidgets/nxconfig.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "ibitmap.hxx" #include "graphics/nxwidgets/ibitmap.hxx"
#include "cbitmap.hxx" #include "graphics/nxwidgets/cbitmap.hxx"
#include "cimage.hxx" #include "graphics/nxwidgets/cimage.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

8
graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx → graphics/NxWidgets/nxwidgets/src/ckeypad.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/ckeypad.cxx * apps/graphics/NxWidgets/nxwidgets/src/ckeypad.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,9 +45,9 @@
#include <nuttx/nx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "cwidgetstyle.hxx" #include "graphics/nxwidgets/cwidgetstyle.hxx"
#include "ckeypad.hxx" #include "graphics/nxwidgets/ckeypad.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

8
graphics/NxWidgets/libnxwidgets/src/clabel.cxx → graphics/NxWidgets/nxwidgets/src/clabel.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/clabel.cxx * apps/graphics/NxWidgets/nxwidgets/src/clabel.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,9 +79,9 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxconfig.hxx" #include "graphics/nxwidgets/nxconfig.hxx"
#include "clabel.hxx" #include "graphics/nxwidgets/clabel.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

8
graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx → graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/clatchbutton.cxx * apps/graphics/NxWidgets/nxwidgets/src/clatchbutton.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -79,9 +79,9 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cstickybutton.hxx" #include "graphics/nxwidgets/cstickybutton.hxx"
#include "clatchbutton.hxx" #include "graphics/nxwidgets/clatchbutton.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

8
graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx → graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx * apps/graphics/NxWidgets/nxwidgets/src/clatchbuttonarray.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,9 +45,9 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "cstickybuttonarray.hxx" #include "graphics/nxwidgets/cstickybuttonarray.hxx"
#include "clatchbuttonarray.hxx" #include "graphics/nxwidgets/clatchbuttonarray.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

12
graphics/NxWidgets/libnxwidgets/src/clistbox.cxx → graphics/NxWidgets/nxwidgets/src/clistbox.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/clistbox.cxx * apps/graphics/NxWidgets/nxwidgets/src/clistbox.cxx
* *
* Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -76,11 +76,11 @@
#include <cstdint> #include <cstdint>
#include <cstdbool> #include <cstdbool>
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "clistbox.hxx" #include "graphics/nxwidgets/clistbox.hxx"
#include "cgraphicsport.hxx" #include "graphics/nxwidgets/cgraphicsport.hxx"
#include "cnxfont.hxx" #include "graphics/nxwidgets/cnxfont.hxx"
#include "singletons.hxx" #include "graphics/nxwidgets/singletons.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

6
graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx → graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/graphics/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx * apps/graphics/NxWidgets/nxwidgets/src/clistboxdataitem.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -76,8 +76,8 @@
#include <cstdint> #include <cstdint>
#include <cstdbool> #include <cstdbool>
#include "cwidgetcontrol.hxx" #include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "clistboxdataitem.hxx" #include "graphics/nxwidgets/clistboxdataitem.hxx"
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions

Some files were not shown because too many files have changed in this diff Show More