use ICON_NULL define rather then 0, makes UI calls less confusing. (no functional...
[blender.git] / source / blender / editors / space_text / text_header.c
index 4b37994c39e1e7cbd249f6be08374a960d5e9894..8ad4d6fa89067f226e38b0c9ca0ed97d589d5004 100644 (file)
 
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
+#ifdef WITH_PYTHON
 // XXX #include "BPY_menus.h"
 #endif
 
@@ -104,7 +101,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);
@@ -136,23 +133,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);
        }
 }
@@ -162,10 +159,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);
 }
 
@@ -175,18 +172,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);
        }
 }
@@ -196,7 +193,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);