aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gwin/slider
diff options
context:
space:
mode:
Diffstat (limited to 'demos/modules/gwin/slider')
-rw-r--r--demos/modules/gwin/slider/gfxconf.h44
-rw-r--r--demos/modules/gwin/slider/main.c6
2 files changed, 25 insertions, 25 deletions
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
index 9d55d29f..367a87f5 100644
--- a/demos/modules/gwin/slider/gfxconf.h
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -31,40 +31,40 @@
#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_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GQUEUE GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_SLIDER TRUE
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_SLIDER GFXON
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* Features for the GQUEUE subsystem. */
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 66cd7a1b..5e90c554 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -70,12 +70,12 @@ int main(void) {
// Set the widget defaults
gwinSetDefaultFont(gdispOpenFont("UI2"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
- gdispClear(White);
+ gdispClear(GFX_WHITE);
// create the widget
createWidgets();
- gwinSetColor(ghConsole, Green);
- gwinSetBgColor(ghConsole, White);
+ gwinSetColor(ghConsole, GFX_GREEN);
+ gwinSetBgColor(ghConsole, GFX_WHITE);
gwinClear(ghConsole);
// We want to listen for widget events