diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 04:32:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 04:32:33 +0400 |
| commit | b4df6b2819784c7a8de8d017316d69048ecc2648 (patch) | |
| tree | b4596d7a86be9bb5e8425e945e2aec3e94c3c2d9 /source/blender/editors/include | |
| parent | 62adcad9bd7277253efa972d6284ddbf564e5705 (diff) | |
code cleanup: changing the INT define to an enum conflicts with INT typedef on windows, use more verbose names for button pointer types. also removed some redundant flags from buttons.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index e4ac0a17b63..ecf0f9f8c2f 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -188,16 +188,16 @@ typedef struct uiLayout uiLayout; * - bit 9-15: button type (now 6 bits, 64 types) * */ typedef enum { - CHA = 32, - SHO = 64, - INT = 96, - FLO = 128, -/* FUN = 192, */ /*UNUSED*/ - BIT = 256 + UI_BUT_POIN_CHAR = 32, + UI_BUT_POIN_SHORT = 64, + UI_BUT_POIN_INT = 96, + UI_BUT_POIN_FLOAT = 128, +/* UI_BUT_POIN_FUNCTION = 192, */ /*UNUSED*/ + UI_BUT_POIN_BIT = 256 /* OR'd with a bit index*/ } eButPointerType; -/* button reqyires a pointer */ -#define BUTPOIN (FLO | SHO | CHA) +/* button requires a pointer */ +#define UI_BUT_POIN_TYPES (UI_BUT_POIN_FLOAT | UI_BUT_POIN_SHORT | UI_BUT_POIN_CHAR) /* assigned to but->type, OR'd with the flags above when passing args */ typedef enum { |