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 da6bea9425882cbe33152ae4a2c6f2a1b553095b..8ad4d6fa89067f226e38b0c9ca0ed97d589d5004 100644 (file)
 #include "BLI_winstuff.h"
 #endif
 
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_text_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 
 #include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_library.h"
-#include "BKE_main.h"
-#include "BKE_scene.h"
-#include "BKE_screen.h"
-#include "BKE_text.h"
 
 #include "ED_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
 
-#include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
 
-#include "RNA_access.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
+#ifdef WITH_PYTHON
 // XXX #include "BPY_menus.h"
 #endif
 
@@ -121,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);
@@ -153,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);
        }
 }
@@ -179,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);
 }
 
@@ -192,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);
        }
 }
@@ -213,11 +193,11 @@ void TEXT_OT_properties(wmOperatorType *ot)
 
        uiPopupMenu *pup;
 
-       pup= uiPupMenuBegin(C, "Text", 0);
-       uiItemEnumO(layout, "Top of File", 0, "TEXT_OT_move", "type", FILE_TOP);
-       uiItemEnumO(layout, "Bottom of File", 0, "TEXT_OT_move", "type", FILE_BOTTOM);
-       uiItemEnumO(layout, "Page Up", 0, "TEXT_OT_move", "type", PREV_PAGE);
-       uiItemEnumO(layout,  "Page Down", 0, "TEXT_OT_move", "type", NEXT_PAGE);
+       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);
+       uiItemEnumO(layout, "TEXT_OT_move", "Page Down", 0, "type", NEXT_PAGE);
        uiPupMenuEnd(C, pup);
 }
 #endif