diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 03:10:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 03:10:23 +0400 |
| commit | 319831d7b8ed395f3a03c97dfb2fed75ee13daa2 (patch) | |
| tree | d5a957c9b90381e4c402b7bbd1e5448dd713e04d /source/blender/editors/interface/interface_intern.h | |
| parent | ed6215bff10710e5d0ff39faac3ab7516c71561c (diff) | |
code cleanup: use an enum for uiBut->pointype (more useful debug display of members),
and rename COL -> COLOR --- less confusing since the layout engine has row/col's.
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index a5e4fa5890f..73e6427d1cb 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -94,8 +94,7 @@ typedef enum { UI_WTYPE_BOX, UI_WTYPE_SCROLL, UI_WTYPE_LISTITEM, - UI_WTYPE_PROGRESSBAR, - + UI_WTYPE_PROGRESSBAR } uiWidgetTypeEnum; /* panel limits */ @@ -133,7 +132,7 @@ typedef enum { /* bit button defines */ /* Bit operations */ -#define UI_BITBUT_TEST(a, b) ( ( (a) & 1 << (b) ) != 0) +#define UI_BITBUT_TEST(a, b) ( ( (a) & 1 << (b) ) != 0) #define UI_BITBUT_SET(a, b) ( (a) | 1 << (b) ) #define UI_BITBUT_CLR(a, b) ( (a) & ~(1 << (b)) ) /* bit-row */ @@ -159,8 +158,9 @@ typedef struct { struct uiBut { struct uiBut *next, *prev; int flag, drawflag; - eButType type; - short pointype, bit, bitnr, retval, strwidth, ofs, pos, selsta, selend, alignnr; + eButType type; + eButPointerType pointype; + short bit, bitnr, retval, strwidth, ofs, pos, selsta, selend, alignnr; char *str; char strdata[UI_MAX_NAME_STR]; @@ -421,7 +421,7 @@ struct uiPopupBlockHandle { float retvec[4]; }; -uiBlock *ui_block_func_COL(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but); +uiBlock *ui_block_func_COLOR(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but); void ui_block_func_ICONROW(struct bContext *C, uiLayout *layout, void *arg_but); void ui_block_func_ICONTEXTROW(struct bContext *C, uiLayout *layout, void *arg_but); |