From 43e58911a4a85fb4762297408618c06c7b9c7b0d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 12 Jan 2015 01:01:44 -0500 Subject: [PATCH] Remove unused vertical scroll group. --- gtk2_ardour/editor.h | 4 ---- gtk2_ardour/editor_canvas.cc | 5 ----- gtk2_ardour/public_editor.h | 1 - 3 files changed, 10 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index b5382735c8..75fcc18a6c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -503,7 +503,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD ArdourCanvas::Container* get_trackview_group () const { return _trackview_group; } ArdourCanvas::Container* get_noscroll_group () const { return no_scroll_group; } ArdourCanvas::ScrollGroup* get_hscroll_group () const { return h_scroll_group; } - ArdourCanvas::ScrollGroup* get_vscroll_group () const { return v_scroll_group; } ArdourCanvas::ScrollGroup* get_hvscroll_group () const { return hv_scroll_group; } ArdourCanvas::GtkCanvasViewport* get_track_canvas () const; @@ -817,9 +816,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD */ ArdourCanvas::ScrollGroup* hv_scroll_group; - /* The group containing all other groups that are scrolled vertically ONLY - */ - ArdourCanvas::ScrollGroup* v_scroll_group; /* The group containing all other groups that are scrolled horizontally ONLY */ diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 335117114f..2be7b8afbc 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -80,7 +80,6 @@ Editor::initialize_canvas () ArdourCanvas::ScrollGroup* hsg; ArdourCanvas::ScrollGroup* hg; - ArdourCanvas::ScrollGroup* vg; hv_scroll_group = hsg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollSensitivity (ArdourCanvas::ScrollGroup::ScrollsVertically| @@ -88,10 +87,6 @@ Editor::initialize_canvas () CANVAS_DEBUG_NAME (hv_scroll_group, "canvas hv scroll"); _track_canvas->add_scroller (*hsg); - v_scroll_group = vg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsVertically); - CANVAS_DEBUG_NAME (v_scroll_group, "canvas v scroll"); - _track_canvas->add_scroller (*vg); - h_scroll_group = hg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally); CANVAS_DEBUG_NAME (h_scroll_group, "canvas h scroll"); _track_canvas->add_scroller (*hg); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index b7263756a6..33b4782f08 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -369,7 +369,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi virtual ArdourCanvas::Container* get_trackview_group () const = 0; virtual ArdourCanvas::ScrollGroup* get_hscroll_group () const = 0; - virtual ArdourCanvas::ScrollGroup* get_vscroll_group () const = 0; virtual ArdourCanvas::ScrollGroup* get_hvscroll_group () const = 0; virtual ArdourCanvas::GtkCanvasViewport* get_track_canvas() const = 0;