From 014330d3a08104313feee8ce3dfed02fb79bf2d3 Mon Sep 17 00:00:00 2001
From: Andrew Hannam <andrewh@inmarket.com.au>
Date: Mon, 12 Nov 2012 17:00:26 +1000
Subject: gdisp Win32 Orientation support. Revert Macro

gdisp Win32 orientation support.
Revert to producing an error if GDISP_NEED_TEXT is not defined when
GWIN_NEED_CONSOLE or GWIN_NEED_BUTTON is defined.
---
 include/gwin.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/gwin.h b/include/gwin.h
index 6b33a5ff..b1c644a6 100644
--- a/include/gwin.h
+++ b/include/gwin.h
@@ -76,11 +76,11 @@
 #endif
 
 #if GWIN_NEED_CONSOLE && !GDISP_NEED_TEXT
-	#define GDISP_NEED_TEXT TRUE
+	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_CONSOLE is defined."
 #endif
 
 #if GWIN_NEED_BUTTON && !GDISP_NEED_TEXT
-	#define GDISP_NEED_TEXT TRUE
+	#error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_BUTTON is defined."
 #endif
 
 #if GWIN_NEED_BUTTON
-- 
cgit v1.2.3


From 9566e80854c00de3ac90eb026e8c3196a5e168ad Mon Sep 17 00:00:00 2001
From: Andrew Hannam <andrewh@inmarket.com.au>
Date: Mon, 12 Nov 2012 17:10:30 +1000
Subject: Remove RGB565CONVERT()

Remove RGB565CONVERT() macro
Update madlebrot demo to use hardware independant way of setting the
color.
---
 include/gdisp.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include')

diff --git a/include/gdisp.h b/include/gdisp.h
index db865284..9be97a12 100644
--- a/include/gdisp.h
+++ b/include/gdisp.h
@@ -293,7 +293,6 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
  
 /* Now obsolete functions */
 #define gdispBlitArea(x, y, cx, cy, buffer)						gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
-#define RGB565CONVERT(r,g,b) 									RGB2COLOR(r,g,b)
 
 /* Macro definitions for common gets and sets */
 #define gdispSetPowerMode(powerMode)			gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
-- 
cgit v1.2.3