diff options
| author | inmarket <andrewh@inmarket.com.au> | 2016-02-27 11:56:12 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2016-02-27 11:56:12 +1000 |
| commit | ecc7f94c882a9f36538678cbc3ac941d7f518115 (patch) | |
| tree | 69e31f9a574b695ebef95e2f1664e74d367130b6 /src/gwin | |
| parent | c1007a2cc9a5553674e8dbbca8f26addff4bae23 (diff) | |
| download | uGFX-ecc7f94c882a9f36538678cbc3ac941d7f518115.tar.gz uGFX-ecc7f94c882a9f36538678cbc3ac941d7f518115.tar.bz2 uGFX-ecc7f94c882a9f36538678cbc3ac941d7f518115.zip | |
Tidy up flags for custom redraw routines
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/gwin_button.h | 2 | ||||
| -rw-r--r-- | src/gwin/gwin_checkbox.h | 2 | ||||
| -rw-r--r-- | src/gwin/gwin_keyboard.h | 4 | ||||
| -rw-r--r-- | src/gwin/gwin_label.h | 6 | ||||
| -rw-r--r-- | src/gwin/gwin_list.h | 10 | ||||
| -rw-r--r-- | src/gwin/gwin_radio.h | 2 | ||||
| -rw-r--r-- | src/gwin/gwin_slider.h | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h index f226731f..11af82e0 100644 --- a/src/gwin/gwin_button.h +++ b/src/gwin/gwin_button.h @@ -44,7 +44,7 @@ typedef GEventGWin GEventGWinButton; * @note Used only for writing a custom draw routine. * @{ */ -#define GBUTTON_FLG_PRESSED (0x00000001<<0) +#define GBUTTON_FLG_PRESSED 0x01 /** @} */ /** diff --git a/src/gwin/gwin_checkbox.h b/src/gwin/gwin_checkbox.h index 5fc8f8a1..b704dffe 100644 --- a/src/gwin/gwin_checkbox.h +++ b/src/gwin/gwin_checkbox.h @@ -50,7 +50,7 @@ typedef struct GEventGWinCheckbox { * @note Used only for writing a custom draw routine. * @{ */ -#define GCHECKBOX_FLG_CHECKED (0x00000001<<0) +#define GCHECKBOX_FLG_CHECKED 0x01 /** @} */ /* A Checkbox window */ diff --git a/src/gwin/gwin_keyboard.h b/src/gwin/gwin_keyboard.h index 2b1e2627..98780485 100644 --- a/src/gwin/gwin_keyboard.h +++ b/src/gwin/gwin_keyboard.h @@ -44,8 +44,8 @@ typedef GEventGWin GEventGWinKeyboard; * @note Used only for writing a custom draw routine. * @{ */ -#define GKEYBOARD_FLG_REVERTSET (0x00000001<<0) -#define GKEYBOARD_FLG_QUICKUPDATE (0x00000001<<1) +#define GKEYBOARD_FLG_REVERTSET 0x01 +#define GKEYBOARD_FLG_QUICKUPDATE 0x02 #define GKEY_BAD_ROWCOL 255 /** @} */ diff --git a/src/gwin/gwin_label.h b/src/gwin/gwin_label.h index c54d5da4..1e8ba53e 100644 --- a/src/gwin/gwin_label.h +++ b/src/gwin/gwin_label.h @@ -38,9 +38,9 @@ * @note Used only for writing a custom draw routine. * @{ */ -#define GLABEL_FLG_WAUTO (0x00000001 << 0) -#define GLABEL_FLG_HAUTO (0x00000001 << 1) -#define GLABEL_FLG_BORDER (0x00000001 << 2) +#define GLABEL_FLG_WAUTO 0x01 +#define GLABEL_FLG_HAUTO 0x02 +#define GLABEL_FLG_BORDER 0x04 /** @} */ // An label window diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h index 01ac0b0b..a4d8aca7 100644 --- a/src/gwin/gwin_list.h +++ b/src/gwin/gwin_list.h @@ -81,11 +81,11 @@ typedef enum scroll_t { scrollAlways, scrollAuto, scrollSmooth } scroll_t; * @note Used only for writing a custom draw routine. * @{ */ -#define GLIST_FLG_MULTISELECT (0x00000001 << 0) -#define GLIST_FLG_HASIMAGES (0x00000001 << 1) -#define GLIST_FLG_SCROLLALWAYS (0x00000001 << 2) -#define GLIST_FLG_SCROLLSMOOTH (0x00000001 << 3) -#define GLIST_FLG_ENABLERENDER (0x00000001 << 4) +#define GLIST_FLG_MULTISELECT 0x01 +#define GLIST_FLG_HASIMAGES 0x02 +#define GLIST_FLG_SCROLLALWAYS 0x04 +#define GLIST_FLG_SCROLLSMOOTH 0x08 +#define GLIST_FLG_ENABLERENDER 0x10 /** @} */ /** diff --git a/src/gwin/gwin_radio.h b/src/gwin/gwin_radio.h index 197be5d5..3371a9ef 100644 --- a/src/gwin/gwin_radio.h +++ b/src/gwin/gwin_radio.h @@ -50,7 +50,7 @@ typedef struct GEventGWinRadio { * @note Used only for writing a custom draw routine. * @{ */ -#define GRADIO_FLG_PRESSED (0x00000001<<0) +#define GRADIO_FLG_PRESSED 0x01 /** @} */ /** diff --git a/src/gwin/gwin_slider.h b/src/gwin/gwin_slider.h index 000adb78..a3c8489b 100644 --- a/src/gwin/gwin_slider.h +++ b/src/gwin/gwin_slider.h @@ -50,7 +50,7 @@ typedef struct GEventGWinSlider { * @note Used only for writing a custom draw routine. * @{ */ -#define GSLIDER_FLG_EXTENDED_EVENTS (0x00000001<<0) +#define GSLIDER_FLG_EXTENDED_EVENTS 0x01 /** @} */ // A slider window |