diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:48 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:48 +1000 |
| commit | 9d3fc8b36cb57fa23c0b838a54a8bc67328f9672 (patch) | |
| tree | fee15031006a070adb49279540067e90aa6be934 /src/gwin/gwin_rules.h | |
| parent | 92b000291826ca78c30f205c104ac330484b82c9 (diff) | |
| parent | 10c7471149453cea6686aa6f61ec6dac0525c47b (diff) | |
| download | uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.tar.gz uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.tar.bz2 uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'src/gwin/gwin_rules.h')
| -rw-r--r-- | src/gwin/gwin_rules.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gwin/gwin_rules.h b/src/gwin/gwin_rules.h index 7678ab7c..ea35a426 100644 --- a/src/gwin/gwin_rules.h +++ b/src/gwin/gwin_rules.h @@ -38,7 +38,7 @@ #endif #endif #if GWIN_NEED_BUTTON || GWIN_NEED_SLIDER || GWIN_NEED_CHECKBOX || GWIN_NEED_LABEL || GWIN_NEED_RADIO || GWIN_NEED_LIST || \ - GWIN_NEED_IMAGE || GWIN_NEED_CHECKBOX || GWIN_NEED_PROGRESSBAR || GWIN_NEED_KEYBOARD + GWIN_NEED_IMAGE || GWIN_NEED_CHECKBOX || GWIN_NEED_PROGRESSBAR || GWIN_NEED_KEYBOARD || GWIN_NEED_TEXTEDIT #if !GWIN_NEED_WIDGET #if GFX_DISPLAY_RULE_WARNINGS #warning "GWIN: GWIN_NEED_WIDGET is required when a widget is used. It has been turned on for you." @@ -123,6 +123,14 @@ #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is TRUE." #endif #endif + #if GWIN_NEED_TEXTEDIT + #if !GDISP_NEED_TEXT + #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_TEXTEDIT is TRUE." + #endif + #if !(GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD) + #error "GWIN: GINPUT_NEED_KEYBOARD or GWIN_NEED_KEYBOARD is required if GWIN_NEED_TEXTEDIT is TRUE." + #endif + #endif #endif #endif /* _GWIN_RULES_H */ |