Forgot to remove these.

3 files changed, 0 insertions, 683 deletions

diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
deleted file mode 100644
index d2dbb5fe3b0..00000000000
--- a/source/blender/editors/space_action/action_header.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_anim_types.h"
-#include "DNA_action_types.h"
-#include "DNA_key_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_context.h"
-#include "BKE_screen.h"
-
-#include "ED_anim_api.h"
-#include "ED_screen.h"
-#include "ED_transform.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "RNA_access.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 "action_intern.h"
-
-enum {
-	B_REDR= 1,
-	B_MODECHANGE,
-} eActHeader_Events;
-
-/* ********************************************************* */
-/* Menu Defines... */
-
-static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	bScreen *sc= CTX_wm_screen(C);
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceAction *sact= CTX_wm_space_action(C);
-	PointerRNA spaceptr;
-	
-	/* retrieve state */
-	RNA_pointer_create(&sc->id, &RNA_SpaceDopeSheetEditor, sact, &spaceptr);
-	
-	/* create menu */
-	//uiItemO(layout, NULL, ICON_MENU_PANEL, "ACTION_OT_properties");
-	
-	//uiItemS(layout);
-	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0);
-	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0);
-	
-	if (sact->flag & SACTION_DRAWTIME)
-		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
-	else
-		uiItemO(layout, "Show Seconds", 0, "ANIM_OT_time_toggle");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set");
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_clear");
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_previewrange_set");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_frame_jump");
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_view_all");
-	
-	if (sa->full) 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Tile Window", Ctrl UpArrow
-	else 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Maximize Window", Ctrl DownArrow
-}
-
-static void act_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "ACTION_OT_select_all_toggle");
-	uiItemBooleanO(layout, "Invert All", 0, "ACTION_OT_select_all_toggle", "invert", 1);
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_select_border");
-	uiItemBooleanO(layout, "Border Axis Range", 0, "ACTION_OT_select_border", "axis_range", 1);
-	
-	uiItemS(layout);
-	
-	uiItemEnumO(layout, "Columns on Selected Keys", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_KEYS);
-	uiItemEnumO(layout, "Column on Current Frame", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_CFRA);
-	
-	uiItemEnumO(layout, "Columns on Selected Markers", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
-	uiItemEnumO(layout, "Between Selected Markers", 0, "ACTION_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
-}
-
-static void act_channelmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_toggle");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_enable");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_disable");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_editable_toggle");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_expand");
-	uiItemO(layout, NULL, 0, "ANIM_OT_channels_collapse");
-}
-
-static void act_gplayermenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	//uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu, NULL, NULL);
-	//uiItemS(layout);
-	//uiItemO(layout, NULL, 0, "NLAEDIT_OT_duplicate");
-}
-
-static void act_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemEnumO(layout, "Grab/Move", 0, "TFM_OT_transform", "mode", TFM_TIME_TRANSLATE);
-	uiItemEnumO(layout, "Extend", 0, "TFM_OT_transform", "mode", TFM_TIME_EXTEND);
-	uiItemEnumO(layout, "Scale", 0, "TFM_OT_transform", "mode", TFM_TIME_SCALE);
-}
-
-static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemMenuF(layout, "Transform", 0, act_edit_transformmenu, NULL);
-	uiItemMenuEnumO(layout, "Snap", 0, "ACTION_OT_snap", "type");
-	uiItemMenuEnumO(layout, "Mirror", 0, "ACTION_OT_mirror", "type");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACT_OT_keyframe_insert");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_duplicate");
-	uiItemO(layout, NULL, 0, "ACTION_OT_delete");
-	
-	uiItemS(layout);
-	
-	uiItemMenuEnumO(layout, "Keyframe Type", 0, "ACTION_OT_keyframe_type", "type");
-	uiItemMenuEnumO(layout, "Handle Type", 0, "ACTION_OT_handle_type", "type");
-	uiItemMenuEnumO(layout, "Interpolation Type", 0, "ACTION_OT_interpolation_type", "type");
-	uiItemMenuEnumO(layout, "Extrapolation Type", 0, "ACTION_OT_extrapolation_type", "type");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_clean");
-	uiItemO(layout, NULL, 0, "ACTION_OT_sample");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ACTION_OT_copy");
-	uiItemO(layout, NULL, 0, "ACTION_OT_paste");
-}
-
-/* ************************ header area region *********************** */
-
-static void do_action_buttons(bContext *C, void *arg, int event)
-{
-	/* special exception for mode changing - enable custom settings? */
-	if (event == B_MODECHANGE) {
-		SpaceAction *saction= CTX_wm_space_action(C);
-		
-		/* if the new mode is ShapeKeys editor, enable sliders */
-		if (saction->mode == SACTCONT_SHAPEKEY)
-			saction->flag |= SACTION_SLIDERS;
-	}
-	
-	ED_area_tag_refresh(CTX_wm_area(C));
-	ED_area_tag_redraw(CTX_wm_area(C));
-}
-
-void action_header_buttons(const bContext *C, ARegion *ar)
-{
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceAction *saction= CTX_wm_space_action(C);
-	bAnimContext ac;
-	uiBlock *block;
-	int xco, yco= 3, xmax;
-	
-	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_action_buttons, NULL);
-	
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	/* get context... (also syncs data) */
-	ANIM_animdata_get_context(C, &ac);
-	
-	if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		
-		xmax= GetButStringLength("View");
-		uiDefMenuBut(block, act_viewmenu, NULL, "View", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Select");
-		uiDefMenuBut(block, act_selectmenu, NULL, "Select", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		if ( (saction->mode == SACTCONT_DOPESHEET) ||
-			 ((saction->action) && (saction->mode==SACTCONT_ACTION)) ) 
-		{
-			xmax= GetButStringLength("Channel");
-			uiDefMenuBut(block, act_channelmenu, NULL, "Channel", xco, yco, xmax-3, 20, "");
-			xco+= xmax;
-		}
-		else if (saction->mode==SACTCONT_GPENCIL) {
-			xmax= GetButStringLength("Channel");
-			uiDefMenuBut(block, act_gplayermenu, NULL, "Channel", xco, yco, xmax-3, 20, "");
-			xco+= xmax;
-		}
-		
-		//xmax= GetButStringLength("Marker");
-		//uiDefMenuBut(block, act_markermenu, NULL, "Marker", xco, yco, xmax-3, 20, "");
-		//xco+= xmax;
-		
-		if (saction->mode == SACTCONT_GPENCIL) {
-			//xmax= GetButStringLength("Frame");
-			//uiDefMenuBut(block, act_selectmenu, NULL, "Frame", xco, yco, xmax-3, 20, "");
-			//xco+= xmax;
-		}
-		else {
-			xmax= GetButStringLength("Key");
-			uiDefMenuBut(block, act_editmenu, NULL, "Key", xco, yco, xmax-3, 20, "");
-			xco+= xmax;
-		}
-	}
-
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	/* MODE SELECTOR */
-	uiDefButC(block, MENU, B_MODECHANGE, 
-			"Editor Mode %t|DopeSheet %x3|Action Editor %x0|ShapeKey Editor %x1|Grease Pencil %x2", 
-			xco,yco,90,YIC, &saction->mode, 0, 1, 0, 0, 
-			"Editing modes for this editor");
-	
-	
-	xco += (90 + 8);
-	
-	/* SUMMARY CHANNEL */
-	uiDefIconTextButBitI(block, TOG, ADS_FILTER_SUMMARY, B_REDR, ICON_BORDERMOVE, "Summary", xco,yco,XIC*4,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Include DopeSheet summary row"); // TODO: needs a better icon
-	xco += (XIC*4.5);
-	
-	/*if (ac.data)*/ 
-	{
-		/* MODE-DEPENDENT DRAWING */
-		if (saction->mode == SACTCONT_DOPESHEET) {
-			/* FILTERING OPTIONS */
-			xco -= XIC; // XXX first button incurs this offset...
-			xco= ANIM_headerUI_standard_buttons(C, &saction->ads, block, xco, yco);
-		}
-		else if (saction->mode == SACTCONT_ACTION) {
-			uiLayout *layout;
-			bScreen *sc= CTX_wm_screen(C);
-			PointerRNA ptr;
-			
-			RNA_pointer_create(&sc->id, &RNA_SpaceDopeSheetEditor, saction, &ptr);
-			
-			layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER, xco, 20+3, 20, 1, U.uistyles.first);
-			uiTemplateID(layout, (bContext*)C, &ptr, "action", "ACTION_OT_new", NULL, NULL);
-			uiBlockLayoutResolve(block, &xco, NULL);
-			
-			xco += 8;
-		}
-		
-		/* draw AUTOSNAP */
-		if (saction->mode != SACTCONT_GPENCIL) {
-			if (saction->flag & SACTION_DRAWTIME) {
-				uiDefButC(block, MENU, B_REDR,
-						"Auto-Snap Keyframes %t|No Snap %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
-						xco,yco,90,YIC, &(saction->autosnap), 0, 1, 0, 0, 
-						"Auto-snapping mode for keyframes when transforming");
-			}
-			else {
-				uiDefButC(block, MENU, B_REDR, 
-						"Auto-Snap Keyframes %t|No Snap %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
-						xco,yco,90,YIC, &(saction->autosnap), 0, 1, 0, 0, 
-						"Auto-snapping mode for keyframes when transforming");
-			}
-			
-			xco += (90 + 8);
-		}
-		
-		/* COPY PASTE */
-		uiBlockBeginAlign(block);
-			uiDefIconButO(block, BUT, "ACTION_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, "Copies the selected keyframes to the buffer.");
-			xco += XIC;
-			uiDefIconButO(block, BUT, "ACTION_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEDOWN, xco,yco,XIC,YIC, "Pastes the keyframes from the buffer into the selected channels.");
-		uiBlockEndAlign(block);
-		xco += (XIC + 8);
-	}
-
-	/* always as last */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, (int)(ar->v2d.tot.ymax-ar->v2d.tot.ymin));
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
-
diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
deleted file mode 100644
index 8aeb76cae0f..00000000000
--- a/source/blender/editors/space_graph/graph_header.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_anim_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-
-#include "BKE_context.h"
-#include "BKE_screen.h"
-
-#include "ED_anim_api.h"
-#include "ED_transform.h"
-#include "ED_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "RNA_access.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 "graph_intern.h"
-
-/* ********************************************************* */
-
-static void do_graph_buttons(bContext *C, void *arg, int event)
-{
-	ED_area_tag_refresh(CTX_wm_area(C));
-	ED_area_tag_redraw(CTX_wm_area(C));
-}
-
-
diff --git a/source/blender/editors/space_nla/nla_header.c b/source/blender/editors/space_nla/nla_header.c
deleted file mode 100644
index 2624e7a9255..00000000000
--- a/source/blender/editors/space_nla/nla_header.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation, Joshua Leung
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include "DNA_anim_types.h"
-#include "DNA_action_types.h"
-#include "DNA_nla_types.h"
-#include "DNA_object_types.h"
-#include "DNA_space_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_rand.h"
-
-#include "BKE_animsys.h"
-#include "BKE_nla.h"
-#include "BKE_context.h"
-#include "BKE_report.h"
-#include "BKE_screen.h"
-#include "ED_types.h"
-#include "ED_util.h"
-
-#include "ED_anim_api.h"
-#include "ED_markers.h"
-#include "ED_space_api.h"
-#include "ED_screen.h"
-#include "ED_transform.h"
-
-#include "BIF_gl.h"
-
-#include "RNA_access.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
-
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
-
-#include "nla_intern.h"
-
-/* button events */
-enum {
-	B_REDR 	= 1,
-} eNLAHeader_ButEvents;
-
-/* ************************ header area region *********************** */
-
-
-static void nla_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	bScreen *sc= CTX_wm_screen(C);
-	ScrArea *sa= CTX_wm_area(C);
-	SpaceNla *snla= CTX_wm_space_nla(C);
-	PointerRNA spaceptr;
-	
-	/* retrieve state */
-	RNA_pointer_create(&sc->id, &RNA_SpaceNLA, snla, &spaceptr);
-	
-	/* create menu */
-	uiItemO(layout, NULL, ICON_MENU_PANEL, "NLA_OT_properties");
-	
-	uiItemS(layout);
-	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0);
-	
-	if (snla->flag & SNLA_DRAWTIME)
-		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
-	else
-		uiItemO(layout, "Show Seconds", 0, "ANIM_OT_time_toggle");
-	
-	uiItemR(layout, NULL, 0, &spaceptr, "show_strip_curves", 0);
-	
-	uiItemS(layout);
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set");
-	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_clear");
-	
-	uiItemS(layout);
-	
-	//uiItemO(layout, NULL, 0, "NLA_OT_view_all");
-	
-	if (sa->full) 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Tile Window", Ctrl UpArrow
-	else 
-		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Maximize Window", Ctr DownArrow
-}
-
-static void nla_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "NLA_OT_select_all_toggle");
-	uiItemBooleanO(layout, "Invert All", 0, "NLA_OT_select_all_toggle", "invert", 1);
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_select_border");
-	uiItemBooleanO(layout, "Border Axis Range", 0, "NLA_OT_select_border", "axis_range", 1);
-}
-
-static void nla_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	// XXX these operators may change for NLA...
-	uiItemEnumO(layout, "Grab/Move", 0, "TFM_OT_transform", "mode", TFM_TRANSLATION);
-	uiItemEnumO(layout, "Extend", 0, "TFM_OT_transform", "mode", TFM_TIME_EXTEND);
-	uiItemEnumO(layout, "Scale", 0, "TFM_OT_transform", "mode", TFM_TIME_SCALE);
-}
-
-static void nla_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	Scene *scene= CTX_data_scene(C);
-	
-	uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu, NULL);
-	uiItemMenuEnumO(layout, "Snap", 0, "NLA_OT_snap", "type");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_duplicate");
-	uiItemO(layout, NULL, 0, "NLA_OT_split");
-	uiItemO(layout, NULL, 0, "NLA_OT_delete");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_mute_toggle");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_apply_scale");
-	uiItemO(layout, NULL, 0, "NLA_OT_clear_scale");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_move_up");
-	uiItemO(layout, NULL, 0, "NLA_OT_move_down");
-	
-	uiItemS(layout);
-	
-	// TODO: names of these tools for 'tweakmode' need changing?
-	if (scene->flag & SCE_NLA_EDIT_ON) 
-		uiItemO(layout, "Stop Tweaking Strip Actions", 0, "NLA_OT_tweakmode_exit");
-	else
-		uiItemO(layout, "Start Tweaking Strip Actions", 0, "NLA_OT_tweakmode_enter");
-}
-
-static void nla_addmenu(bContext *C, uiLayout *layout, void *arg_unused)
-{
-	uiItemO(layout, NULL, 0, "NLA_OT_actionclip_add");
-	uiItemO(layout, NULL, 0, "NLA_OT_transition_add");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_meta_add");
-	uiItemO(layout, NULL, 0, "NLA_OT_meta_remove");
-	
-	uiItemS(layout);
-	
-	uiItemO(layout, NULL, 0, "NLA_OT_tracks_add");
-	uiItemBooleanO(layout, "Add Tracks Above Selected", 0, "NLA_OT_tracks_add", "above_selected", 1);
-}
-
-/* ------------------ */
-
-static void do_nla_buttons(bContext *C, void *arg, int event)
-{
-	ED_area_tag_refresh(CTX_wm_area(C));
-	ED_area_tag_redraw(CTX_wm_area(C));
-}
-
-
-void nla_header_buttons(const bContext *C, ARegion *ar)
-{
-	SpaceNla *snla= CTX_wm_space_nla(C);
-	ScrArea *sa= CTX_wm_area(C);
-	uiBlock *block;
-	int xco, yco= 3;
-	
-	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS);
-	uiBlockSetHandleFunc(block, do_nla_buttons, NULL);
-	
-	xco= ED_area_header_standardbuttons(C, block, yco);
-	
-	if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		int xmax;
-		
-		xmax= GetButStringLength("View");
-		uiDefMenuBut(block, nla_viewmenu, NULL, "View", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Select");
-		uiDefMenuBut(block, nla_selectmenu, NULL, "Select", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Edit");
-		uiDefMenuBut(block, nla_editmenu, NULL, "Edit", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-		
-		xmax= GetButStringLength("Add");
-		uiDefMenuBut(block, nla_addmenu, NULL, "Add", xco, yco, xmax-3, 20, "");
-		xco+= xmax;
-	}
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	/* filtering buttons */
-	xco= ANIM_headerUI_standard_buttons(C, snla->ads, block, xco, yco);
-	
-	/* auto-snap selector */
-	if (snla->flag & SNLA_DRAWTIME) {
-		uiDefButS(block, MENU, B_REDR,
-				"Auto-Snap %t|No Time-Snap %x0|Nearest Second %x2|Nearest Marker %x3", 
-				xco,yco,90,YIC, &snla->autosnap, 0, 1, 0, 0, 
-				"Auto-snapping mode for times when transforming");
-	}
-	else {
-		uiDefButS(block, MENU, B_REDR, 
-				"Auto-Snap %t|No Time-Snap %x0|Nearest Frame %x2|Nearest Marker %x3", 
-				xco,yco,90,YIC, &snla->autosnap, 0, 1, 0, 0, 
-				"Auto-snapping mode for times when transforming");
-	}
-	xco += 98;
-	
-	/* always as last  */
-	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin);
-	
-	uiEndBlock(C, block);
-	uiDrawBlock(C, block);
-}
-
-