diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 8c2b1f7817..ef3201e05f 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -200,7 +200,6 @@
-
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 2ff5d24999..3582c58286 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1328,7 +1328,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void remove_control_point (ArdourCanvas::Item*, GdkEvent*);
void mouse_brush_insert_region (RegionView*, framepos_t pos);
- void brush (framepos_t);
void show_verbose_time_cursor (framepos_t frame, double offset = 0, double xpos=-1, double ypos=-1);
void show_verbose_duration_cursor (framepos_t start, framepos_t end, double offset = 0, double xpos=-1, double ypos=-1);
@@ -1407,12 +1406,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void set_playhead_cursor ();
- void kbd_driver (sigc::slot, bool use_track_canvas = true, bool use_time_canvas = true, bool can_select = true);
void toggle_region_mute ();
- void kbd_brush ();
-
- void kbd_do_brush (GdkEvent*);
- void kbd_do_audition (GdkEvent*);
void initialize_canvas ();
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 4c640c87f6..9e9d58adc9 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -321,8 +321,6 @@ Editor::register_actions ()
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "play-edit-range", _("Play Edit Range"), sigc::mem_fun(*this, &Editor::play_edit_range));
- act = ActionManager::register_action (editor_actions, "brush-at-mouse", _("Brush at Mouse"), sigc::mem_fun(*this, &Editor::kbd_brush));
- ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "set-playhead", _("Playhead to Mouse"), sigc::mem_fun(*this, &Editor::set_playhead_cursor));
ActionManager::session_sensitive_actions.push_back (act);
diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
deleted file mode 100644
index 8f4941a590..0000000000
--- a/gtk2_ardour/editor_keyboard.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- Copyright (C) 2004 Paul Davis
-
- 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "pbd/memento_command.h"
-#include "pbd/stateful_diff_command.h"
-
-#include "ardour/audioregion.h"
-#include "ardour/playlist.h"
-#include "ardour/session.h"
-#include "ardour/location.h"
-
-#include "editor.h"
-#include "region_view.h"
-#include "selection.h"
-#include "keyboard.h"
-#include "editor_drag.h"
-
-#include "i18n.h"
-
-using namespace ARDOUR;
-using namespace PBD;
-
-void
-Editor::kbd_driver (sigc::slot theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
-{
- gint x, y;
- double worldx, worldy;
- GdkEvent ev;
- Gdk::ModifierType mask;
- Glib::RefPtr evw = track_canvas->get_window()->get_pointer (x, y, mask);
- bool doit = false;
-
- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
- doit = true;
- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
- doit = true;
- }
-
- /* any use of "keyboard mouse buttons" invalidates an existing grab
- */
-
- if (_drags->active ()) {
- _drags->abort ();
- }
-
- if (doit) {
-
- if (entered_regionview && can_select) {
- selection->set (entered_regionview);
- }
-
- track_canvas->window_to_world (x, y, worldx, worldy);
- worldx += horizontal_position();
- worldy += vertical_adjustment.get_value();
-
- ev.type = GDK_BUTTON_PRESS;
- ev.button.x = worldx;
- ev.button.y = worldy;
- ev.button.state = 0; /* XXX correct? */
-
- theslot (&ev);
- }
-}
-
-void
-Editor::kbd_do_brush (GdkEvent *ev)
-{
- brush (event_frame (ev, 0, 0));
-}
-
-void
-Editor::kbd_brush ()
-{
- kbd_driver (sigc::mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
-}
-
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index e521beb64f..d79f1df47b 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4585,22 +4585,6 @@ Editor::external_edit_region ()
/* more to come */
}
-void
-Editor::brush (framepos_t pos)
-{
- snap_to (pos);
-
- RegionSelection rs = get_regions_from_selection_and_entered ();
-
- if (rs.empty()) {
- return;
- }
-
- for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
- mouse_brush_insert_region ((*i), pos);
- }
-}
-
void
Editor::reset_region_gain_envelopes ()
{
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 909c027828..ef2bfc5277 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -82,7 +82,6 @@ gtk2_ardour_sources = [
'editor_route_groups.cc',
'editor_export_audio.cc',
'editor_group_tabs.cc',
- 'editor_keyboard.cc',
'editor_keys.cc',
'editor_locations.cc',
'editor_markers.cc',