diff options
| author | Tectu <joel@unormal.org> | 2012-11-12 02:13:49 -0800 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-11-12 02:13:49 -0800 |
| commit | 0a8a5703913612fe8035c4dad3adb20a90dfe940 (patch) | |
| tree | 368eeab239b543745f205e9f8b21a3e5ce9186a8 /include | |
| parent | ed73471f99dda8db0c4aa267291d9688b76a3d82 (diff) | |
| parent | 67ae847970aee780fb28580bd17233df5f5bb3b2 (diff) | |
| download | uGFX-0a8a5703913612fe8035c4dad3adb20a90dfe940.tar.gz uGFX-0a8a5703913612fe8035c4dad3adb20a90dfe940.tar.bz2 uGFX-0a8a5703913612fe8035c4dad3adb20a90dfe940.zip | |
Merge pull request #17 from inmarket/master
gdisp Win32 orientaion support. Revert Macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/gdisp.h | 1 | ||||
| -rw-r--r-- | include/gwin.h | 4 |
2 files changed, 2 insertions, 3 deletions
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))
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
|