aboutsummaryrefslogtreecommitdiffstats
path: root/demos/3rdparty
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-02-27 17:44:21 +1000
committerinmarket <andrewh@inmarket.com.au>2018-02-27 17:44:21 +1000
commitf265924396167729e8d9fb36a0383263f36c1270 (patch)
tree28843eb24b18999cf0217ecb0fe935f133901066 /demos/3rdparty
parent14786e97b618b8bc2a0ff1c732d45288fe550e33 (diff)
downloaduGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.gz
uGFX-f265924396167729e8d9fb36a0383263f36c1270.tar.bz2
uGFX-f265924396167729e8d9fb36a0383263f36c1270.zip
First set of V3 macro changes
Diffstat (limited to 'demos/3rdparty')
-rw-r--r--demos/3rdparty/bubbles/gfxconf.h44
-rw-r--r--demos/3rdparty/notepad-2/gfxconf.h76
2 files changed, 60 insertions, 60 deletions
diff --git a/demos/3rdparty/bubbles/gfxconf.h b/demos/3rdparty/bubbles/gfxconf.h
index b4fd0a9c..a6f046d2 100644
--- a/demos/3rdparty/bubbles/gfxconf.h
+++ b/demos/3rdparty/bubbles/gfxconf.h
@@ -10,33 +10,33 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION FALSE
-#define GDISP_NEED_CLIP FALSE
-#define GDISP_NEED_TEXT FALSE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_MULTITHREAD FALSE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
+#define GDISP_NEED_VALIDATION GFXOFF
+#define GDISP_NEED_CLIP GFXOFF
+#define GDISP_NEED_TEXT GFXOFF
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXOFF
+#define GDISP_NEED_ARC GFXOFF
+#define GDISP_NEED_SCROLL GFXOFF
+#define GDISP_NEED_PIXELREAD GFXOFF
+#define GDISP_NEED_CONTROL GFXOFF
+#define GDISP_NEED_MULTITHREAD GFXOFF
+#define GDISP_NEED_ASYNC GFXOFF
+#define GDISP_NEED_MSGAPI GFXOFF
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 FALSE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+#define GDISP_INCLUDE_FONT_SMALL GFXOFF
+#define GDISP_INCLUDE_FONT_LARGER GFXOFF
+#define GDISP_INCLUDE_FONT_UI1 GFXOFF
+#define GDISP_INCLUDE_FONT_UI2 GFXOFF
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/3rdparty/notepad-2/gfxconf.h b/demos/3rdparty/notepad-2/gfxconf.h
index 869b2ab2..7bbace41 100644
--- a/demos/3rdparty/notepad-2/gfxconf.h
+++ b/demos/3rdparty/notepad-2/gfxconf.h
@@ -10,55 +10,55 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_CONVEX_POLYGON FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXOFF
+#define GDISP_NEED_ARC GFXOFF
+#define GDISP_NEED_CONVEX_POLYGON GFXOFF
+#define GDISP_NEED_SCROLL GFXOFF
+#define GDISP_NEED_PIXELREAD GFXOFF
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_ASYNC GFXOFF
+#define GDISP_NEED_MSGAPI GFXOFF
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+#define GDISP_INCLUDE_FONT_SMALL GFXOFF
+#define GDISP_INCLUDE_FONT_LARGER GFXOFF
+#define GDISP_INCLUDE_FONT_UI1 GFXOFF
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE FALSE
-#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP FALSE
-#define GDISP_NEED_IMAGE_JPG FALSE
-#define GDISP_NEED_IMAGE_PNG FALSE
+#define GDISP_NEED_IMAGE_NATIVE GFXOFF
+#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXOFF
+#define GDISP_NEED_IMAGE_JPG GFXOFF
+#define GDISP_NEED_IMAGE_PNG GFXOFF
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_BUTTON TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_SLIDER TRUE
+#define GWIN_NEED_BUTTON GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_NEED_SLIDER GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_NEED_DIAL FALSE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_NEED_DIAL GFXOFF
#endif /* _GFXCONF_H */