diff options
Diffstat (limited to 'source/blender/editors/space_text/text_header.c')
| -rw-r--r-- | source/blender/editors/space_text/text_header.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 672940cf3cb..1287f68dc04 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -47,6 +47,7 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" @@ -57,7 +58,7 @@ -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON // XXX #include "BPY_menus.h" #endif @@ -101,7 +102,7 @@ static int properties_poll(bContext *C) return (CTX_wm_space_text(C) != NULL); } -static int properties_exec(bContext *C, wmOperator *op) +static int properties_exec(bContext *C, wmOperator *UNUSED(op)) { ScrArea *sa= CTX_wm_area(C); ARegion *ar= text_has_properties_region(sa); @@ -133,23 +134,23 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; if(text) { - pup= uiPupMenuBegin(C, "Text", 0); + pup= uiPupMenuBegin(C, "Text", ICON_NULL); if(txt_has_sel(text)) { - uiItemO(layout, NULL, 0, "TEXT_OT_cut"); - uiItemO(layout, NULL, 0, "TEXT_OT_copy"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_cut"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_copy"); } - uiItemO(layout, NULL, 0, "TEXT_OT_paste"); - uiItemO(layout, NULL, 0, "TEXT_OT_new"); - uiItemO(layout, NULL, 0, "TEXT_OT_open"); - uiItemO(layout, NULL, 0, "TEXT_OT_save"); - uiItemO(layout, NULL, 0, "TEXT_OT_save_as"); - uiItemO(layout, NULL, 0, "TEXT_OT_run_script"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_paste"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save_as"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_run_script"); uiPupMenuEnd(C, pup); } else { - pup= uiPupMenuBegin(C, "File", 0); - uiItemO(layout, NULL, 0, "TEXT_OT_new"); - uiItemO(layout, NULL, 0, "TEXT_OT_open"); + pup= uiPupMenuBegin(C, "File", ICON_NULL); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); uiPupMenuEnd(C, pup); } } @@ -159,10 +160,10 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; - pup= uiPupMenuBegin(C, "Edit", 0); - uiItemO(layout, NULL, 0, "TEXT_OT_cut"); - uiItemO(layout, NULL, 0, "TEXT_OT_copy"); - uiItemO(layout, NULL, 0, "TEXT_OT_paste"); + pup= uiPupMenuBegin(C, "Edit", ICON_NULL); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_cut"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_copy"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_paste"); uiPupMenuEnd(C, pup); } @@ -172,18 +173,18 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; if(text) { - pup= uiPupMenuBegin(C, "Text", 0); - uiItemO(layout, NULL, 0, "TEXT_OT_new"); - uiItemO(layout, NULL, 0, "TEXT_OT_open"); - uiItemO(layout, NULL, 0, "TEXT_OT_save"); - uiItemO(layout, NULL, 0, "TEXT_OT_save_as"); - uiItemO(layout, NULL, 0, "TEXT_OT_run_script"); + pup= uiPupMenuBegin(C, "Text", ICON_NULL); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save_as"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_run_script"); uiPupMenuEnd(C, pup); } else { - pup= uiPupMenuBegin(C, "File", 0); - uiItemO(layout, NULL, 0, "TEXT_OT_new"); - uiItemO(layout, NULL, 0, "TEXT_OT_open"); + pup= uiPupMenuBegin(C, "File", ICON_NULL); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); uiPupMenuEnd(C, pup); } } @@ -193,7 +194,7 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; - pup= uiPupMenuBegin(C, "Text", 0); + pup= uiPupMenuBegin(C, "Text", ICON_NULL); uiItemEnumO(layout, "TEXT_OT_move", "Top of File", 0, "type", FILE_TOP); uiItemEnumO(layout, "TEXT_OT_move", "Bottom of File", 0, "type", FILE_BOTTOM); uiItemEnumO(layout, "TEXT_OT_move", "Page Up", 0, "type", PREV_PAGE); |