From 4ed5cd6cef341727f230ff2d50feb460773a055d Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Sun, 27 Feb 2011 18:03:19 +0000 Subject: == UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning. --- source/blender/editors/space_text/text_header.c | 52 ++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'source/blender/editors/space_text/text_header.c') diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 8e209365c0c..e8aaa623945 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -134,23 +134,23 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; if(text) { - pup= uiPupMenuBegin(C, "Text", ICON_NULL); + pup= uiPupMenuBegin(C, "Text", ICON_NONE); if(txt_has_sel(text)) { - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_cut"); - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_copy"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_cut"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_copy"); } - 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"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_paste"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_open"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_save"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_save_as"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_run_script"); uiPupMenuEnd(C, pup); } else { - pup= uiPupMenuBegin(C, "File", ICON_NULL); - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); + pup= uiPupMenuBegin(C, "File", ICON_NONE); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_open"); uiPupMenuEnd(C, pup); } } @@ -160,10 +160,10 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; - 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"); + pup= uiPupMenuBegin(C, "Edit", ICON_NONE); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_cut"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_copy"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_paste"); uiPupMenuEnd(C, pup); } @@ -173,18 +173,18 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; if(text) { - 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"); + pup= uiPupMenuBegin(C, "Text", ICON_NONE); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_open"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_save"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_save_as"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_run_script"); uiPupMenuEnd(C, pup); } else { - pup= uiPupMenuBegin(C, "File", ICON_NULL); - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new"); - uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open"); + pup= uiPupMenuBegin(C, "File", ICON_NONE); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_new"); + uiItemO(layout, NULL, ICON_NONE, "TEXT_OT_open"); uiPupMenuEnd(C, pup); } } @@ -194,7 +194,7 @@ void TEXT_OT_properties(wmOperatorType *ot) uiPopupMenu *pup; - pup= uiPupMenuBegin(C, "Text", ICON_NULL); + pup= uiPupMenuBegin(C, "Text", ICON_NONE); 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); -- cgit v1.2.3