diff options
author | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2011-02-27 21:03:19 +0300 |
commit | 4ed5cd6cef341727f230ff2d50feb460773a055d (patch) | |
tree | aeae01ad3f237785a238ed46086271d678464b03 /source/blender/editors/space_text | |
parent | 7a4ca6a36dbcd48721f09801195075e2a01f1dcc (diff) |
== UI icons ==
* Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/text_header.c | 52 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 6 |
2 files changed, 29 insertions, 29 deletions
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); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index effe2d6be1a..d4b9963f355 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -3103,7 +3103,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( case 1: if(text->flags & TXT_ISDIRTY) { /* modified locally and externally, ahhh. offer more possibilites. */ - pup= uiPupMenuBegin(C, "File Modified Outside and Inside Blender", ICON_NULL); + pup= uiPupMenuBegin(C, "File Modified Outside and Inside Blender", ICON_NONE); layout= uiPupMenuLayout(pup); uiItemEnumO(layout, op->type->idname, "Reload from disk (ignore local changes)", 0, "resolution", RESOLVE_RELOAD); uiItemEnumO(layout, op->type->idname, "Save to disk (ignore outside changes)", 0, "resolution", RESOLVE_SAVE); @@ -3111,7 +3111,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( uiPupMenuEnd(C, pup); } else { - pup= uiPupMenuBegin(C, "File Modified Outside Blender", ICON_NULL); + pup= uiPupMenuBegin(C, "File Modified Outside Blender", ICON_NONE); layout= uiPupMenuLayout(pup); uiItemEnumO(layout, op->type->idname, "Reload from disk", 0, "resolution", RESOLVE_RELOAD); uiItemEnumO(layout, op->type->idname, "Make text internal (separate copy)", 0, "resolution", RESOLVE_MAKE_INTERNAL); @@ -3120,7 +3120,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( } break; case 2: - pup= uiPupMenuBegin(C, "File Deleted Outside Blender", ICON_NULL); + pup= uiPupMenuBegin(C, "File Deleted Outside Blender", ICON_NONE); layout= uiPupMenuLayout(pup); uiItemEnumO(layout, op->type->idname, "Make text internal", 0, "resolution", RESOLVE_MAKE_INTERNAL); uiItemEnumO(layout, op->type->idname, "Recreate file", 0, "resolution", RESOLVE_SAVE); |