2.5

Cleanup of wm_event_types.h, removed all old "allqueue" defines.

8 files changed, 23 insertions, 317 deletions

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index f33d2bf2a48..37e2f07f4c8 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -99,7 +99,6 @@ static void waitcursor() {}
 static int pupmenu() {return 0;}
 static int qtest() {return 0;}
 #define add_numbut(a, b, c, d, e, f, g) {}
-static int do_clever_numbuts() {return 0;}
 static int snap_sel_to_curs() {return 0;}
 static int snap_to_center() {return 0;}
 
@@ -4769,7 +4768,7 @@ int EdgeLoopDelete(EditMesh *em, wmOperator *op)
 
 
 /* -------------------- More tools ------------------ */
-
+#if 0
 void mesh_set_face_flags(EditMesh *em, short mode)
 {
 	EditFace *efa;
@@ -4837,6 +4836,7 @@ void mesh_set_face_flags(EditMesh *em, short mode)
 	}
 	
 }
+#endif
 
 void mesh_set_smooth_faces(EditMesh *em, short event)
 {
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 75c1f9032c1..fa4265e8475 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -139,7 +139,6 @@
 #include "object_intern.h"	// own include
 
 /* ************* XXX **************** */
-static void allqueue() {}
 static void error() {}
 static void waitcursor() {}
 static int pupmenu() {return 0;}
@@ -190,7 +189,6 @@ void ED_base_object_activate(bContext *C, Base *base)
 	if(base) {
 		
 		/* XXX old signals, remember to handle notifiers now! */
-		//		allqueue(REDRAWIPO, base->object->ipowin);
 		//		select_actionchannel_by_name(base->object->action, "Object", 1);
 		
 		/* disable temporal locks */
@@ -1320,10 +1318,6 @@ void add_hook_menu(Scene *scene, View3D *v3d)
 		
 	/* do operations */
 	add_hook(scene, v3d, mode);
-	
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
-	
 }
 
 /* ******************** clear parent operator ******************* */
@@ -2263,7 +2257,6 @@ void make_vertex_parent(Scene *scene, Object *obedit, View3D *v3d)
 			}
 		}
 	}
-	allqueue(REDRAWVIEW3D, 0);
 	
 	DAG_scene_sort(scene);
 }
@@ -2350,7 +2343,6 @@ void make_proxy(Scene *scene)
 		
 		DAG_scene_sort(scene);
 		DAG_object_flush_update(scene, newob, OB_RECALC);
-		allqueue(REDRAWALL, 0);
 	}
 }
 
@@ -3016,7 +3008,6 @@ static int object_set_center_exec(bContext *C, wmOperator *op)
 					cu->xof /= cu->fsize;
 					cu->yof /= cu->fsize;
 
-					allqueue(REDRAWBUTSEDIT, 0);
 					tot_change++;
 				}
 			}
@@ -3050,7 +3041,6 @@ static int object_set_center_exec(bContext *C, wmOperator *op)
 	
 	if (tot_change) {
 		ED_anim_dag_flush_update(C);
-		allqueue(REDRAWVIEW3D, 0);
 	}
 	
 	/* Warn if any errors occured */
@@ -3342,11 +3332,6 @@ void movetolayer(Scene *scene, View3D *v3d)
 	
 	DAG_scene_sort(scene);
 	
-	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWINFO, 0);
-	
 }
 
 
@@ -3471,9 +3456,6 @@ static void spot_interactive(Object *ob, int mode)
 			la->clipend= origval;
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSSHADING, 0);
-	BIF_preview_changed(ID_LA);
 }
 #endif
 
@@ -3538,8 +3520,6 @@ void special_editmenu(Scene *scene, View3D *v3d)
 				}
 			}
 			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWBUTSEDIT, 0);
 		}
 		else if(G.f & G_VERTEXPAINT) {
 			Mesh *me= get_mesh(ob);
@@ -3661,7 +3641,6 @@ void special_editmenu(Scene *scene, View3D *v3d)
 					}
 				}
 
-				allqueue(REDRAWVIEW3D, 0);
 			}
 			else if (ob->type == OB_FONT) {
 				/* removed until this gets a decent implementation (ton) */
@@ -3848,8 +3827,6 @@ void special_editmenu(Scene *scene, View3D *v3d)
 		}
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
-	
 }
 
 static void curvetomesh(Scene *scene, Object *ob) 
@@ -4083,10 +4060,6 @@ void convertmenu(Scene *scene, View3D *v3d)
 // XXX	exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
 	BASACT= basact;
 
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWOOPS, 0);
-//	allspace(OOPS_TEST, 0);
-	allqueue(REDRAWBUTSEDIT, 0);
 
 	DAG_scene_sort(scene);
 }
@@ -4225,10 +4198,6 @@ void flip_subdivison(Scene *scene, View3D *v3d, int level)
 		}
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 	ED_anim_dag_flush_update(C);	
 }
  
@@ -4289,7 +4258,6 @@ static void copymenu_properties(Scene *scene, View3D *v3d, Object *ob)
 		}
 	}
 	MEM_freeN(str);
-	allqueue(REDRAWVIEW3D, 0);
 	
 }
 
@@ -4424,8 +4392,6 @@ static void copymenu_modifiers(Scene *scene, View3D *v3d, Object *ob)
 	
 //	if(errorstr) notice(errorstr);
 	
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 	DAG_scene_sort(scene);
 	
 }
@@ -4715,16 +4681,11 @@ void copy_attr(Scene *scene, View3D *v3d, short event)
 		}
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
 	if(do_scene_sort)
 		DAG_scene_sort(scene);
 
 	ED_anim_dag_flush_update(C);	
 
-	if(event==20) {
-		allqueue(REDRAWBUTSOBJECT, 0);
-	}
-	
 }
 
 void copy_attr_menu(Scene *scene, View3D *v3d)
@@ -4923,10 +4884,6 @@ void make_links(Scene *scene, View3D *v3d, short event)
 		}
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWBUTSHEAD, 0);
-
 	ED_anim_dag_flush_update(C);	
 
 }
@@ -5155,7 +5112,6 @@ static void apply_objects_internal(Scene *scene, View3D *v3d, int apply_scale, i
 		}
 	}
 	if (change) {
-		allqueue(REDRAWVIEW3D, 0);
 	}
 }
 
@@ -5194,7 +5150,6 @@ void apply_objects_visual_tx( Scene *scene, View3D *v3d )
 		}
 	}
 	if (change) {
-		allqueue(REDRAWVIEW3D, 0);
 	}
 }
 
@@ -5618,7 +5573,6 @@ void single_user(Scene *scene, View3D *v3d)
 		
 		clear_id_newpoins();
 
-		allqueue(REDRAWALL, 0);
 	}
 }
 
@@ -5663,7 +5617,6 @@ void make_local(Scene *scene, View3D *v3d, int mode)
 	
 	if(mode==3) {
 		all_local(NULL, 0);	/* NULL is all libs */
-		allqueue(REDRAWALL, 0);
 		return;
 	}
 	else if(mode<1) return;
@@ -5789,7 +5742,6 @@ void make_local(Scene *scene, View3D *v3d, int mode)
 		}
 	}
 
-	allqueue(REDRAWALL, 0);
 }
 
 void make_local_menu(Scene *scene, View3D *v3d)
@@ -6148,7 +6100,6 @@ void image_aspect(Scene *scene, View3D *v3d)
 		}
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 void set_ob_ipoflags(Scene *scene, View3D *v3d)
@@ -6183,12 +6134,6 @@ void set_ob_ipoflags(Scene *scene, View3D *v3d)
 			}
 		}
 	}
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
-	allqueue(REDRAWNLA, 0);
-	allqueue (REDRAWACTION, 0);
-//	allspace(REMAKEIPO, 0);
-	allqueue(REDRAWIPO, 0);
 #endif // XXX old animation system
 }
 
@@ -6231,11 +6176,6 @@ void select_select_keys(Scene *scene, View3D *v3d)
 		}
 	}
 
-	allqueue(REDRAWNLA, 0);
-	allqueue(REDRAWACTION, 0);
-	allqueue(REDRAWVIEW3D, 0);
-//	allspace(REMAKEIPO, 0);
-	allqueue(REDRAWIPO, 0);
 
 #endif  // XXX old animation system
 }
@@ -6296,8 +6236,6 @@ void auto_timeoffs(Scene *scene, View3D *v3d)
 	}
 	MEM_freeN(basesort);
 
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 }
 
 void ofs_timeoffs(Scene *scene, View3D *v3d)
@@ -6318,8 +6256,6 @@ void ofs_timeoffs(Scene *scene, View3D *v3d)
 		}
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 }
 
 
@@ -6342,8 +6278,6 @@ void rand_timeoffs(Scene *scene, View3D *v3d)
 		}
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 }
 
 
@@ -6468,8 +6402,5 @@ void hookmenu(Scene *scene, View3D *v3d)
 	}
 	
 	if (changed) {
-		
-		allqueue(REDRAWVIEW3D, 0);
-		allqueue(REDRAWBUTSEDIT, 0);
 	}	
 }
diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index c7257184c77..e8f39a94c76 100644
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -767,7 +767,7 @@ void node_header_buttons(const bContext *C, ARegion *ar)
 		xco+= 100;
 		uiDefButBitI(block, TOG, R_COMP_FREE, B_NOP, "Free Unused", xco+5,yco,100,19, &scene->r.scemode, 0.0f, 0.0f, 0, 0, "Free Nodes that are not used while composite");
 		xco+= 100;
-		uiDefButBitS(block, TOG, SNODE_BACKDRAW, REDRAWNODE, "Backdrop", xco+5,yco,90,19, &snode->flag, 0.0f, 0.0f, 0, 0, "Use active Viewer Node output as backdrop");
+		uiDefButBitS(block, TOG, SNODE_BACKDRAW, B_REDR, "Backdrop", xco+5,yco,90,19, &snode->flag, 0.0f, 0.0f, 0, 0, "Use active Viewer Node output as backdrop");
 		xco+= 90;
 	}
 	else if(snode->treetype==NTREE_TEXTURE) {
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index a3569365041..622a07ccd4f 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -132,7 +132,6 @@
 
 /* ************* XXX **************** */
 
-static void allqueue() {}
 static void BIF_undo_push() {}
 static void BIF_preview_changed() {}
 static void error() {}
@@ -1465,9 +1464,6 @@ void outliner_toggle_visibility(Scene *scene, SpaceOops *soops)
 	
 	BIF_undo_push("Outliner toggle selectability");
 
-	allqueue(REDRAWVIEW3D, 1);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWINFO, 1);
 }
 
 static void object_toggle_selectability_cb(TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem)
@@ -1488,9 +1484,6 @@ void outliner_toggle_selectability(Scene *scene, SpaceOops *soops)
 	
 	BIF_undo_push("Outliner toggle selectability");
 
-	allqueue(REDRAWVIEW3D, 1);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWINFO, 1);
 }
 
 void object_toggle_renderability_cb(TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem)
@@ -1511,9 +1504,6 @@ void outliner_toggle_renderability(Scene *scene, SpaceOops *soops)
 	
 	BIF_undo_push("Outliner toggle renderability");
 
-	allqueue(REDRAWVIEW3D, 1);
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWINFO, 1);
 }
 
 void outliner_toggle_visible(SpaceOops *soops)
@@ -1641,7 +1631,6 @@ static int tree_element_active_renderlayer(TreeElement *te, TreeStoreElem *tsele
 	
 	if(set) {
 		sce->r.actlay= tselem->nr;
-		allqueue(REDRAWBUTSSCENE, 0);
 	}
 	else {
 		return sce->r.actlay==tselem->nr;
@@ -1733,10 +1722,6 @@ static int tree_element_active_material(Scene *scene, SpaceOops *soops, TreeElem
 	if(set) {
 // XXX		extern_set_butspace(F5KEY, 0);	// force shading buttons
 		BIF_preview_changed(ID_MA);
-		allqueue(REDRAWBUTSSHADING, 1);
-		allqueue(REDRAWNODE, 0);
-		allqueue(REDRAWOOPS, 0);
-		allqueue(REDRAWIPO, 0);
 	}
 	return 0;
 }
@@ -1823,9 +1808,6 @@ static int tree_element_active_lamp(Scene *scene, SpaceOops *soops, TreeElement
 	if(set) {
 // XXX		extern_set_butspace(F5KEY, 0);
 		BIF_preview_changed(ID_LA);
-		allqueue(REDRAWBUTSSHADING, 1);
-		allqueue(REDRAWOOPS, 0);
-		allqueue(REDRAWIPO, 0);
 	}
 	else return 1;
 	
@@ -1870,7 +1852,6 @@ static int tree_element_active_defgroup(Scene *scene, TreeElement *te, TreeStore
 	if(set) {
 		ob->actdef= te->index+1;
 		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
-		allqueue(REDRAWVIEW3D, ob->ipowin);
 	}
 	else {
 		if(ob==OBACT)
@@ -1886,7 +1867,6 @@ static int tree_element_active_posegroup(Scene *scene, TreeElement *te, TreeStor
 	if(set) {
 		if (ob->pose) {
 			ob->pose->active_group= te->index+1;
-			allqueue(REDRAWBUTSEDIT, 0);
 		}
 	}
 	else {
@@ -1909,9 +1889,6 @@ static int tree_element_active_posechannel(Scene *scene, TreeElement *te, TreeSt
 //			else deselectall_posearmature(ob, 0, 0);	// 0 = deselect 
 			pchan->bone->flag |= BONE_SELECTED|BONE_ACTIVE;
 			
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWOOPS, 0);
-			allqueue(REDRAWACTION, 0);
 		}
 	}
 	else {
@@ -1933,9 +1910,6 @@ static int tree_element_active_bone(Scene *scene, TreeElement *te, TreeStoreElem
 //			else deselectall_posearmature(OBACT, 0, 0);
 			bone->flag |= BONE_SELECTED|BONE_ACTIVE;
 			
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWOOPS, 0);
-			allqueue(REDRAWACTION, 0);
 		}
 	}
 	else {
@@ -1965,9 +1939,6 @@ static int tree_element_active_ebone(TreeElement *te, TreeStoreElem *tselem, int
 			// flush to parent?
 			if(ebone->parent && (ebone->flag & BONE_CONNECTED)) ebone->parent->flag |= BONE_TIPSEL;
 			
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWOOPS, 0);
-			allqueue(REDRAWACTION, 0);
 		}
 	}
 	else {
@@ -2053,7 +2024,6 @@ static int tree_element_active_sequence(TreeElement *te, TreeStoreElem *tselem,
 
 	if(set) {
 // XXX		select_single_seq(seq, 1);
-		allqueue(REDRAWSEQ, 0);
 	}
 	else {
 		if(seq->flag & SELECT)
@@ -2086,7 +2056,6 @@ static int tree_element_active_sequence_dup(Scene *scene, TreeElement *te, TreeS
 // XXX			select_single_seq(p, 0);
 		p= p->next;
 	}
-	allqueue(REDRAWSEQ, 0);
 	return(0);
 }
 
@@ -2917,7 +2886,6 @@ static void sequence_cb(int event, TreeElement *te, TreeStoreElem *tselem)
 //	Sequence *seq= (Sequence*) te->directdata;
 	if(event==1) {
 // XXX		select_single_seq(seq, 1);
-		allqueue(REDRAWSEQ, 0);
 	}
 }
 
@@ -2950,7 +2918,6 @@ void outliner_del(Scene *scene, ARegion *ar, SpaceOops *soops)
 //		DAG_scene_sort(scene);
 //		BIF_undo_push("Delete Objects");
 //	}
-//	allqueue(REDRAWALL, 0);	
 }
 
 
@@ -3005,7 +2972,6 @@ void outliner_operation_menu(Scene *scene, ARegion *ar, SpaceOops *soops)
 			}
 			
 			BIF_undo_push(str);
-			allqueue(REDRAWALL, 0);
 		}
 	}
 	else if(idlevel) {
@@ -3023,11 +2989,9 @@ void outliner_operation_menu(Scene *scene, ARegion *ar, SpaceOops *soops)
 					case ID_MA:
 						outliner_do_libdata_operation(soops, &soops->tree, unlink_material_cb);
 						BIF_undo_push("Unlink material");
-						allqueue(REDRAWBUTSSHADING, 1);
 						break;
 					case ID_TE:
 						outliner_do_libdata_operation(soops, &soops->tree, unlink_texture_cb);
-						allqueue(REDRAWBUTSSHADING, 1);
 						BIF_undo_push("Unlink texture");
 						break;
 					case ID_GR:
@@ -3037,12 +3001,10 @@ void outliner_operation_menu(Scene *scene, ARegion *ar, SpaceOops *soops)
 					default:
 						error("Not yet...");
 				}
-				allqueue(REDRAWALL, 0);
 			}
 			else if(event==2) {
 				outliner_do_libdata_operation(soops, &soops->tree, id_local_cb);
 				BIF_undo_push("Localized Data");
-				allqueue(REDRAWALL, 0); 
 			}
 			else if(event==3 && idlevel==ID_GR) {
 				outliner_do_libdata_operation(soops, &soops->tree, group_linkobs2scene_cb);
@@ -3081,9 +3043,6 @@ void outliner_operation_menu(Scene *scene, ARegion *ar, SpaceOops *soops)
 				}
 			}
 
-			allqueue(REDRAWOOPS, 0);
-			allqueue(REDRAWBUTSALL, 0);
-			allqueue(REDRAWVIEW3D, 0);
 		}
 	}
 }
@@ -3969,8 +3928,6 @@ static void restrictbutton_view_cb(bContext *C, void *poin, void *poin2)
 		}
 	}
 
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static void restrictbutton_sel_cb(bContext *C, void *poin, void *poin2)
@@ -3992,21 +3949,15 @@ static void restrictbutton_sel_cb(bContext *C, void *poin, void *poin2)
 		}
 	}
 
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static void restrictbutton_rend_cb(bContext *C, void *poin, void *poin2)
 {
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static void restrictbutton_r_lay_cb(bContext *C, void *poin, void *poin2)
 {
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWNODE, 0);
-	allqueue(REDRAWBUTSSCENE, 0);
+	/* XXX redraws */
 }
 
 static void restrictbutton_modifier_cb(bContext *C, void *poin, void *poin2)
@@ -4017,17 +3968,11 @@ static void restrictbutton_modifier_cb(bContext *C, void *poin, void *poin2)
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 	object_handle_update(scene, ob);
 
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
 }
 
 static void restrictbutton_bone_cb(bContext *C, void *poin, void *poin2)
 {
-	allqueue(REDRAWOOPS, 0);
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWBUTSEDIT, 0);
+	/* XXX redraws */
 }
 
 static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
@@ -4057,7 +4002,6 @@ static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
 			switch(tselem->type) {
 			case TSE_DEFGROUP:
 				unique_vertexgroup_name(te->directdata, (Object *)tselem->id); //	id = object
-				allqueue(REDRAWBUTSEDIT, 0);
 				break;
 			case TSE_NLA_ACTION:
 				test_idbutton(tselem->id->name+2);
@@ -4074,9 +4018,6 @@ static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
 					BLI_strncpy(ebone->name, oldnamep, 32);
 // XXX					armature_bone_rename(obedit->data, oldnamep, newname);
 				}
-				allqueue(REDRAWOOPS, 0);
-				allqueue(REDRAWVIEW3D, 1);
-				allqueue(REDRAWBUTSEDIT, 0);
 			}
 				break;
 
@@ -4095,9 +4036,6 @@ static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
 					BLI_strncpy(bone->name, oldnamep, 32);
 // XXX					armature_bone_rename(ob->data, oldnamep, newname);
 				}
-				allqueue(REDRAWOOPS, 0);
-				allqueue(REDRAWVIEW3D, 1);
-				allqueue(REDRAWBUTSEDIT, 0);
 				break;
 			case TSE_POSE_CHANNEL:
 				{
@@ -4114,9 +4052,6 @@ static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
 					BLI_strncpy(pchan->name, oldnamep, 32);
 // XXX					armature_bone_rename(ob->data, oldnamep, newname);
 				}
-				allqueue(REDRAWOOPS, 0);
-				allqueue(REDRAWVIEW3D, 1);
-				allqueue(REDRAWBUTSEDIT, 0);
 				break;
 			case TSE_POSEGRP:
 				{
@@ -4124,12 +4059,9 @@ static void namebutton_cb(bContext *C, void *tep, void *oldnamep)
 					bActionGroup *grp= te->directdata;
 					
 					BLI_uniquename(&ob->pose->agroups, grp, "Group", offsetof(bActionGroup, name), 32);
-					allqueue(REDRAWBUTSEDIT, 0);
 				}
 				break;
 			case TSE_R_LAYER:
-				allqueue(REDRAWOOPS, 0);
-				allqueue(REDRAWBUTSSCENE, 0);
 				break;
 			}
 		}
@@ -4151,17 +4083,17 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				ob = (Object *)tselem->id;
 				
 				uiBlockSetEmboss(block, UI_EMBOSSN);
-				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_VIEW, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_VIEW, 0, ICON_RESTRICT_VIEW_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, &(ob->restrictflag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
 				uiButSetFunc(bt, restrictbutton_view_cb, scene, ob);
 				uiButSetFlag(bt, UI_NO_HILITE);
 				
-				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_SELECT, REDRAWALL, ICON_RESTRICT_SELECT_OFF, 
+				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_SELECT, 0, ICON_RESTRICT_SELECT_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, (short)te->ys, 17, OL_H-1, &(ob->restrictflag), 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
 				uiButSetFunc(bt, restrictbutton_sel_cb, scene, ob);
 				uiButSetFlag(bt, UI_NO_HILITE);
 				
-				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_RENDER, REDRAWALL, ICON_RESTRICT_RENDER_OFF, 
+				bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_RENDER, 0, ICON_RESTRICT_RENDER_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, (short)te->ys, 17, OL_H-1, &(ob->restrictflag), 0, 0, 0, 0, "Restrict/Allow renderability");
 				uiButSetFunc(bt, restrictbutton_rend_cb, NULL, NULL);
 				uiButSetFlag(bt, UI_NO_HILITE);
@@ -4172,7 +4104,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 			else if(tselem->type==TSE_R_LAYER) {
 				uiBlockSetEmboss(block, UI_EMBOSSN);
 				
-				bt= uiDefIconButBitI(block, ICONTOGN, SCE_LAY_DISABLE, REDRAWBUTSSCENE, ICON_CHECKBOX_HLT-1, 
+				bt= uiDefIconButBitI(block, ICONTOGN, SCE_LAY_DISABLE, 0, ICON_CHECKBOX_HLT-1, 
 									 (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, te->directdata, 0, 0, 0, 0, "Render this RenderLayer");
 				uiButSetFunc(bt, restrictbutton_r_lay_cb, NULL, NULL);
 				
@@ -4183,13 +4115,13 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				uiBlockSetEmboss(block, UI_EMBOSSN);
 				
 				/* NOTE: tselem->nr is short! */
-				bt= uiDefIconButBitI(block, ICONTOG, tselem->nr, REDRAWBUTSSCENE, ICON_CHECKBOX_HLT-1, 
+				bt= uiDefIconButBitI(block, ICONTOG, tselem->nr, 0, ICON_CHECKBOX_HLT-1, 
 									 (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, layflag, 0, 0, 0, 0, "Render this Pass");
 				uiButSetFunc(bt, restrictbutton_r_lay_cb, NULL, NULL);
 				
 				layflag++;	/* is lay_xor */
 				if(ELEM6(tselem->nr, SCE_PASS_SPEC, SCE_PASS_SHADOW, SCE_PASS_AO, SCE_PASS_REFLECT, SCE_PASS_REFRACT, SCE_PASS_RADIO))
-					bt= uiDefIconButBitI(block, TOG, tselem->nr, REDRAWBUTSSCENE, (*layflag & tselem->nr)?ICON_DOT:ICON_BLANK1, 
+					bt= uiDefIconButBitI(block, TOG, tselem->nr, 0, (*layflag & tselem->nr)?ICON_DOT:ICON_BLANK1, 
 									 (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, (short)te->ys, 17, OL_H-1, layflag, 0, 0, 0, 0, "Exclude this Pass from Combined");
 				uiButSetFunc(bt, restrictbutton_r_lay_cb, NULL, NULL);
 				
@@ -4200,12 +4132,12 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				ob = (Object *)tselem->id;
 				
 				uiBlockSetEmboss(block, UI_EMBOSSN);
-				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Realtime, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Realtime, 0, ICON_RESTRICT_VIEW_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
 				uiButSetFunc(bt, restrictbutton_modifier_cb, scene, ob);
 				uiButSetFlag(bt, UI_NO_HILITE);
 				
-				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Render, REDRAWALL, ICON_RESTRICT_RENDER_OFF, 
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Render, 0, ICON_RESTRICT_RENDER_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, (short)te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow renderability");
 				uiButSetFunc(bt, restrictbutton_modifier_cb, scene, ob);
 				uiButSetFlag(bt, UI_NO_HILITE);
@@ -4215,7 +4147,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				Bone *bone = pchan->bone;
 
 				uiBlockSetEmboss(block, UI_EMBOSSN);
-				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_P, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_P, 0, ICON_RESTRICT_VIEW_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, &(bone->flag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
 				uiButSetFunc(bt, restrictbutton_bone_cb, NULL, NULL);
 				uiButSetFlag(bt, UI_NO_HILITE);
@@ -4224,7 +4156,7 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				EditBone *ebone= (EditBone *)te->directdata;
 
 				uiBlockSetEmboss(block, UI_EMBOSSN);
-				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_A, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_A, 0, ICON_RESTRICT_VIEW_OFF, 
 						(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, &(ebone->flag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
 				uiButSetFunc(bt, restrictbutton_bone_cb, NULL, NULL);
 				uiButSetFlag(bt, UI_NO_HILITE);
diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c
index b796e207266..a9cad256200 100644
--- a/source/blender/editors/space_time/time_header.c
+++ b/source/blender/editors/space_time/time_header.c
@@ -529,11 +529,11 @@ void time_header_buttons(const bContext *C, ARegion *ar)
 	xco+= XIC+8;
 	
 	uiBlockBeginAlign(block);
-		uiDefIconButBitS(block, TOG, AUTOKEY_ON, REDRAWINFO, ICON_REC,
+		uiDefIconButBitS(block, TOG, AUTOKEY_ON, B_REDRAWALL, ICON_REC,
 						 xco, yco, XIC, YIC, &(scene->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
 		xco+= XIC;
 		if (IS_AUTOKEY_ON(scene)) {
-			uiDefButS(block, MENU, REDRAWINFO, 
+			uiDefButS(block, MENU, B_REDRAWALL, 
 					  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
 					  xco, yco, (int)5.5*XIC, YIC, &(scene->autokey_mode), 0, 1, 0, 0, 
 					  "Mode of automatic keyframe insertion for Objects and Bones");
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index e5ab9ddc369..cbb08a01be6 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -967,19 +967,19 @@ static void view3d_panel_transform_spaces(const bContext *C, ARegion *ar, short
 	
 	uiBlockBeginAlign(block);
 	
-	uiDefButS(block, ROW, REDRAWHEADERS, "Global",	xco, 		90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_GLOBAL,0, 0, "Global Transform Orientation");
-	uiDefButS(block, ROW, REDRAWHEADERS, "Local",	xco + 40,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_LOCAL, 0, 0, "Local Transform Orientation");
-	uiDefButS(block, ROW, REDRAWHEADERS, "Normal",	xco + 80,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_NORMAL,0, 0, "Normal Transform Orientation");
-	uiDefButS(block, ROW, REDRAWHEADERS, "View",		xco + 120,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_VIEW,	0, 0, "View Transform Orientation");
+	uiDefButS(block, ROW, B_REDR, "Global",	xco, 		90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_GLOBAL,0, 0, "Global Transform Orientation");
+	uiDefButS(block, ROW, B_REDR, "Local",	xco + 40,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_LOCAL, 0, 0, "Local Transform Orientation");
+	uiDefButS(block, ROW, B_REDR, "Normal",	xco + 80,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_NORMAL,0, 0, "Normal Transform Orientation");
+	uiDefButS(block, ROW, B_REDR, "View",		xco + 120,	90, 40,20, &v3d->twmode, 5.0, (float)V3D_MANIP_VIEW,	0, 0, "View Transform Orientation");
 	
 	for (index = V3D_MANIP_CUSTOM, ts = transform_spaces->first ; ts ; ts = ts->next, index++) {
 
 		UI_ThemeColor(TH_BUT_ACTION);
 		if (v3d->twmode == index) {
-			but = uiDefIconButS(block,ROW, REDRAWHEADERS, ICON_CHECKBOX_HLT, xco,yco,XIC,YIC, &v3d->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
+			but = uiDefIconButS(block,ROW, B_REDR, ICON_CHECKBOX_HLT, xco,yco,XIC,YIC, &v3d->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
 		}
 		else {
-			but = uiDefIconButS(block,ROW, REDRAWHEADERS, ICON_CHECKBOX_DEHLT, xco,yco,XIC,YIC, &v3d->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
+			but = uiDefIconButS(block,ROW, B_REDR, ICON_CHECKBOX_DEHLT, xco,yco,XIC,YIC, &v3d->twmode, 5.0, (float)index, 0, 0, "Use this Custom Transform Orientation");
 		}
 		uiButSetFunc(but, selectTransformOrientation_func, ts, NULL);
 		uiDefBut(block, TEX, 0, "", xco+=XIC, yco,100+XIC,20, &ts->name, 0, 30, 0, 0, "Edits the name of this Transform Orientation");
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 7131bf65495..b41dec913ad 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -118,7 +118,6 @@
 
 /* XXX port over */
 static void handle_view3d_lock(void) {}
-static void allqueue(int x, int y) {}
 static void countall(void) {}
 extern void borderselect();
 static int retopo_mesh_paint_check() {return 0;}
@@ -245,9 +244,7 @@ void do_layer_buttons(bContext *C, short event)
 	}
 	ED_area_tag_redraw(sa);
 	
-	if(sa->spacetype==SPACE_OOPS) allqueue(REDRAWVIEW3D, 1); /* 1==also do headwin */
 	if(v3d->drawtype == OB_SHADED) reshadeall_displist(scene);
-	allqueue(REDRAWNLA, 0);	
 }
 
 #if 0
@@ -278,7 +275,6 @@ static void do_view3d_view_camerasmenu(bContext *C, void *arg, int event)
 		}
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 
@@ -368,7 +364,6 @@ static void do_view3d_view_cameracontrolsmenu(bContext *C, void *arg, int event)
 		fly();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 
@@ -460,7 +455,6 @@ static void do_view3d_view_alignviewmenu(bContext *C, void *arg, int event)
 		curs[0]=curs[1]=curs[2]= 0.0;
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static uiBlock *view3d_view_alignviewmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -554,7 +548,6 @@ static void do_view3d_viewmenu(bContext *C, void *arg, int event)
 		do_layer_buttons(C, -2);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 1);
 }
 #endif
 
@@ -768,7 +761,6 @@ void do_view3d_select_object_typemenu(bContext *C, void *arg, int event)
 		do_layer_buttons(C, -2);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static uiBlock *view3d_select_object_typemenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -831,7 +823,6 @@ void do_view3d_select_object_layermenu(bContext *C, void *arg, int event)
 // XXX		selectall_layer(event);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static uiBlock *view3d_select_object_layermenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -882,7 +873,6 @@ void do_view3d_select_object_linkedmenu(bContext *C, void *arg, int event)
 		break;
 	}
 	countall();
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static uiBlock *view3d_select_object_linkedmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -921,8 +911,6 @@ void do_view3d_select_object_groupedmenu(bContext *C, void *arg, int event)
 		select_object_grouped((short)event);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
-
 }
 
 static uiBlock *view3d_select_object_groupedmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -1068,7 +1056,6 @@ void do_view3d_select_meshmenu(bContext *C, void *arg, int event)
 			select_mesh_group_menu();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1212,7 +1199,6 @@ void do_view3d_select_metaballmenu(bContext *C, void *arg, int event)
 			selectrandom_mball();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1262,7 +1248,6 @@ static void do_view3d_select_latticemenu(bContext *C, void *arg, int event)
 			deselectall_Latt();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1320,7 +1305,6 @@ static void do_view3d_select_armaturemenu(bContext *C, void *arg, int event)
 			armature_select_hierarchy(BONE_SELECT_CHILD, 1);
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1392,7 +1376,6 @@ static void do_view3d_select_pose_armaturemenu(bContext *C, void *arg, int event
 		pose_select_hierarchy(BONE_SELECT_CHILD, 1);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1456,7 +1439,6 @@ void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
 			select_linked_tfaces(2);
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1532,7 +1514,6 @@ void do_view3d_edit_snapmenu(bContext *C, void *arg, int event)
 		ED_undo_push(C, "Snap selection to center");
 	    break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1599,7 +1580,6 @@ void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event)
 			Transform();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1667,7 +1647,6 @@ void do_view3d_transform_rotateaxismenu(bContext *C, void *arg, int event)
 			Transform();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1735,7 +1714,6 @@ void do_view3d_transform_scaleaxismenu(bContext *C, void *arg, int event)
 			Transform();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1846,7 +1824,6 @@ static void do_view3d_transformmenu(bContext *C, void *arg, int event)
 		alignmenu();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -1975,7 +1952,6 @@ void do_view3d_object_mirrormenu(bContext *C, void *arg, int event)
 			Transform();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2027,7 +2003,6 @@ static void do_view3d_edit_object_transformmenu(bContext *C, void *arg, int even
 		apply_objects_visual_tx();
 		break;	
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2097,7 +2072,6 @@ static void do_view3d_edit_object_makelinksmenu(bContext *C, void *arg, int even
 		make_links((short)event);
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2177,7 +2151,6 @@ static void do_view3d_edit_object_singleusermenu(bContext *C, void *arg, int eve
 	clear_id_newpoins();
 	countall();
 	
-	allqueue(REDRAWALL, 0);
 #endif
 }
 
@@ -2230,7 +2203,6 @@ static void do_view3d_edit_object_copyattrmenu(bContext *C, void *arg, int event
 // XXX		copy_attr((short)event);
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 }
 
 static uiBlock *view3d_edit_object_copyattrmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -2308,7 +2280,6 @@ static void do_view3d_edit_object_parentmenu(bContext *C, void *arg, int event)
 		make_parent();
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2338,7 +2309,6 @@ static void do_view3d_edit_object_groupmenu(bContext *C, void *arg, int event)
 			group_operation(event);
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2370,7 +2340,6 @@ static void do_view3d_edit_object_trackmenu(bContext *C, void *arg, int event)
 		make_track();
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2401,7 +2370,6 @@ static void do_view3d_edit_object_constraintsmenu(bContext *C, void *arg, int ev
 		ob_clear_constraints();
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2437,7 +2405,6 @@ static void do_view3d_edit_object_showhidemenu(bContext *C, void *arg, int event
 		hide_objects(0);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2464,7 +2431,6 @@ static void do_view3d_edit_object_scriptsmenu(bContext *C, void *arg, int event)
 #if 0
 	BPY_menu_do_python(PYMENU_OBJECT, event);
 
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2539,7 +2505,6 @@ static void do_view3d_edit_objectmenu(bContext *C, void *arg, int event)
 		common_deletekey();
 		break; 
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2622,7 +2587,6 @@ static void do_view3d_edit_propfalloffmenu(bContext *C, void *arg, int event)
 	
 	scene->prop_mode= event;
 	
-	allqueue(REDRAWVIEW3D, 1);
 }
 
 static uiBlock *view3d_edit_propfalloffmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -2694,7 +2658,6 @@ void do_view3d_edit_mesh_verticesmenu(bContext *C, void *arg, int event)
 		mesh_rip();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2813,7 +2776,6 @@ void do_view3d_edit_mesh_edgesmenu(bContext *C, void *arg, int event)
 		}
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2883,7 +2845,6 @@ void do_view3d_edit_mesh_facesmenu(bContext *C, void *arg, int event)
 		break;
 	case 2: /* Quads to Tris */
 		convert_to_triface(0);
-		allqueue(REDRAWVIEW3D, 0);
 		countall();
 		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
 		break;
@@ -2903,7 +2864,6 @@ void do_view3d_edit_mesh_facesmenu(bContext *C, void *arg, int event)
 		mesh_set_smooth_faces(0);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -2950,7 +2910,6 @@ void do_view3d_edit_mesh_normalsmenu(bContext *C, void *arg, int event)
 		righthandfaces(1);
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3017,7 +2976,6 @@ void do_view3d_edit_mirrormenu(bContext *C, void *arg, int event)
 			Transform();
 			break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3064,7 +3022,6 @@ static void do_view3d_edit_mesh_showhidemenu(bContext *C, void *arg, int event)
 		hide_mesh(1);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3091,7 +3048,6 @@ static void do_view3d_edit_mesh_scriptsmenu(bContext *C, void *arg, int event)
 #if 0
 	BPY_menu_do_python(PYMENU_MESH, event);
 
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3176,7 +3132,6 @@ static void do_view3d_edit_meshmenu(bContext *C, void *arg, int event)
 		common_deletekey();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3359,7 +3314,6 @@ static void do_view3d_edit_mball_showhidemenu(bContext *C, void *arg, int event)
 		hide_mball(1);
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3411,7 +3365,6 @@ static void do_view3d_edit_metaballmenu(bContext *C, void *arg, int event)
 		add_blockhandler(sa, VIEW3D_HANDLER_OBJECT, 0);
 		break;	
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3511,7 +3464,6 @@ static void do_view3d_edit_text_charsmenu(bContext *C, void *arg, int event)
 		do_textedit(0,0,161);
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3568,7 +3520,6 @@ static void do_view3d_edit_textmenu(bContext *C, void *arg, int event)
 		paste_editText();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3634,7 +3585,6 @@ static void do_view3d_edit_latticemenu(bContext *C, void *arg, int event)
 		common_deletekey();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3696,7 +3646,6 @@ void do_view3d_edit_armature_parentmenu(bContext *C, void *arg, int event)
 		clear_bone_parent();
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3727,7 +3676,6 @@ void do_view3d_edit_armature_rollmenu(bContext *C, void *arg, int event)
 		initTransform(TFM_BONE_ROLL, CTX_NONE);
 		Transform();
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3813,7 +3761,6 @@ static void do_view3d_edit_armaturemenu(bContext *C, void *arg, int event)
 		break;
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3824,7 +3771,6 @@ static void do_view3d_scripts_armaturemenu(bContext *C, void *arg, int event)
 #if 0
 	BPY_menu_do_python(PYMENU_ARMATURE, event);
 	
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -3976,7 +3922,6 @@ static void do_view3d_pose_armature_transformmenu(bContext *C, void *arg, int ev
 		ED_undo_push(C, "Pose, Clear User Transform");
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4016,7 +3961,6 @@ static void do_view3d_pose_armature_showhidemenu(bContext *C, void *arg, int eve
 		hide_unselected_pose_bones();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4050,7 +3994,6 @@ static void do_view3d_pose_armature_ikmenu(bContext *C, void *arg, int event)
 		pose_clear_IK();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4083,7 +4026,6 @@ static void do_view3d_pose_armature_constraintsmenu(bContext *C, void *arg, int
 		pose_clear_constraints();
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4158,7 +4100,6 @@ static void do_view3d_pose_armature_motionpathsmenu(bContext *C, void *arg, int
 		pose_clear_paths(OBACT);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4198,7 +4139,6 @@ static void do_view3d_pose_armature_poselibmenu(bContext *C, void *arg, int even
 			break;
 	}
 	
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4280,7 +4220,6 @@ static void do_view3d_pose_armaturemenu(bContext *C, void *arg, int event)
 		break;
 	}
 		
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4378,7 +4317,6 @@ static void do_view3d_vpaintmenu(bContext *C, void *arg, int event)
 		make_vertexcol(1);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4431,7 +4369,6 @@ static void do_view3d_tpaintmenu(bContext *C, void *arg, int event)
 		break;
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4482,7 +4419,6 @@ static void do_view3d_wpaintmenu(bContext *C, void *arg, int event)
 		pose_adds_vgroups(ob, 1);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4561,8 +4497,6 @@ void do_view3d_sculpt_inputmenu(bContext *C, void *arg, int event)
 		break;
 	}
 	
-	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4731,7 +4665,6 @@ static void do_view3d_facesel_showhidemenu(bContext *C, void *arg, int event)
 //		G.qual &= ~LR_SHIFTKEY;
 		break;
 		}
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -4766,8 +4699,6 @@ static void do_view3d_faceselmenu(bContext *C, void *arg, int event)
 		seam_mark_clear_tface(2);
 		break;
 	}
-	allqueue(REDRAWVIEW3D, 0);
-	allqueue(REDRAWIMAGE, 0);
 #endif
 }
 
@@ -4947,7 +4878,6 @@ void do_view3d_particlemenu(bContext *C, void *arg, int event)
 		break;
 	}
 
-	allqueue(REDRAWVIEW3D, 0);
 #endif
 }
 
@@ -5239,12 +5169,10 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 				PE_set_particle_edit(scene);
 			}
 		}
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 		
 	case B_AROUND:
 // XXX		handle_view3d_around(); /* copies to other 3d windows */
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 		
 	case B_SEL_VERT:
@@ -5289,43 +5217,33 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 	case B_SEL_PATH:
 		scene->selectmode= SCE_SELECT_PATH;
 		ED_undo_push(C, "Selectmode Set: Path");
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_SEL_POINT:
 		scene->selectmode = SCE_SELECT_POINT;
 		ED_undo_push(C, "Selectmode Set: Point");
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_SEL_END:
 		scene->selectmode = SCE_SELECT_END;
 		ED_undo_push(C, "Selectmode Set: End point");
-		allqueue(REDRAWVIEW3D, 1);
 		break;	
 	
 	case B_MAN_TRANS:
 		if( shift==0 || v3d->twtype==0)
 			v3d->twtype= V3D_MANIP_TRANSLATE;
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_MAN_ROT:
 		if( shift==0 || v3d->twtype==0)
 			v3d->twtype= V3D_MANIP_ROTATE;
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_MAN_SCALE:
 		if( shift==0 || v3d->twtype==0)
 			v3d->twtype= V3D_MANIP_SCALE;
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_NDOF:
-		allqueue(REDRAWVIEW3D, 1);
 		break;
 	case B_MAN_MODE:
-		allqueue(REDRAWVIEW3D, 1);
 		break;		
 	case B_VIEW_BUTSEDIT:
-		allqueue(REDRAWVIEW3D, 1);
-		allqueue(REDRAWBUTSEDIT, 1);
 		break;
 		
 	default:
@@ -5364,8 +5282,6 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
 			/* new layers might need unflushed events events */
 			DAG_scene_update_flags(scene, v3d->lay);	/* tags all that moves and flushes */
 
-			allqueue(REDRAWOOPS, 0);
-			allqueue(REDRAWNLA, 0);	
 		}
 		break;
 	}
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 275d8d99810..b3fb17055e1 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -60,16 +60,7 @@
 
 
 /* SYSTEM : 0x01x */
-#define KEYBD			0x0100	/* keyboard */
-#define RAWKEYBD		0x0101	/* raw keyboard for keyboard manager */
-#define REDRAW			0x0102	/* used by port manager to signal redraws */
 #define	INPUTCHANGE		0x0103	/* input connected or disconnected */
-#define	QFULL			0x0104	/* queue was filled */
-#define WINFREEZE		0x0105	/* user wants process in this win to shut up */
-#define WINTHAW			0x0106	/* user wants process in this win to go again */
-#define WINCLOSE		0x0107	/* window close */
-#define WINQUIT			0x0108	/* signal from user that app is to go away */
-#define Q_FIRSTTIME		0x0109	/* on startup */
 
 #define TIMER			0x0110	/* timer event, passed on to all queues */
 #define TIMER0			0x0111	/* timer event, slot for internal use */
@@ -196,68 +187,6 @@
 /* for event checks */
 #define ISKEYBOARD(event)	(event >='a' && event <=255)
 
-
-/* **************** XXX depricated! BLENDER QUEUE EVENTS ********************* */
-
-#define CHANGED				0x4000
-#define DRAWEDGES			0x4001
-#define AFTERQUEUE			0x4002
-#define BACKBUFDRAW			0x4003
-#define EXECUTE				0x4004
-#define IGNORE_REDRAW		0x4005
-#define LOAD_FILE			0x4006
-#define RESHAPE				0x4007
-#define UI_BUT_EVENT		0x4008
-#define AUTOSAVE_FILE		0x4009
-#define UNDOPUSH			0x400A
-
-#define REDRAWVIEW3D		0x4010
-#define REDRAWVIEWCAM		0x4011
-#define REDRAWVIEW3D_Z		0x4012
-
-#define REDRAWALL			0x4013
-#define REDRAWHEADERS		0x4014
-
-#define REDRAWBUTSHEAD		0x4015
-#define REDRAWBUTSALL		0x4016
-
-#define REDRAWBUTSSCENE		0x4017
-#define REDRAWBUTSOBJECT	0x4018
-#define REDRAWBUTSEDIT		0x4019
-#define REDRAWBUTSSCRIPT	0x401A
-#define REDRAWBUTSLOGIC		0x401B
-#define REDRAWBUTSSHADING	0x401C
-#define REDRAWBUTSGAME		0x401D
-#define REDRAWBUTSEFFECTS	0x401D
-
-#define REDRAWINFO			0x4021
-#define RENDERPREVIEW		0x4022
-#define REDRAWIPO			0x4023
-#define REDRAWDATASELECT	0x4024
-#define REDRAWSEQ			0x4025
-#define REDRAWIMAGE			0x4026
-#define REDRAWOOPS			0x4027
-#define REDRAWIMASEL        0x4028
-#define AFTERIMASELIMA      0x4029
-#define AFTERIMASELGET      0x402A
-#define AFTERIMAWRITE       0x402B
-#define IMALEFTMOUSE		0x402C
-#define AFTERPIBREAD        0x402D
-#define REDRAWTEXT	        0x402E
-#define REDRAWSOUND			0x402F
-#define REDRAWACTION		0x4030
-#define REDRAWNLA			0x4031
-#define REDRAWSCRIPT		0x4032
-#define REDRAWTIME			0x4033
-#define REDRAWBUTSCONSTRAINT	0x4034
-#define ONLOAD_SCRIPT		0x4035
-#define SCREEN_HANDLER		0x4036
-#define REDRAWANIM			0x4037
-#define REDRAWNODE			0x4038
-#define RECALC_COMPOSITE	0x4039
-#define REDRAWMARKER		0x4040 /* all views that display markers */
-#define REDRAWVIEW3D_IMAGE	0x4041
-
 /* **************** BLENDER GESTURE EVENTS ********************* */
 
 #define EVT_ACTIONZONE	0x5001
@@ -269,8 +198,6 @@
 #define EVT_TWEAK_A		0x5005
 #define EVT_TWEAK_S		0x5006
 
-
-
 #define EVT_GESTURE		0x5010
 
 /* value of tweaks and line gestures, note, KM_ANY (-1) works for this case too */