fix pathscanner / stl_vector related memory leaks

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index f67ca6a3cea5e70c0eda4861612a17912732b588..31b25164ac2a38db83212c21fc290506ce81afb1 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -297,10 +297,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (false);
                        return true;
-               } else if (Keyboard::no_modifiers_active (ev->state)) {
-                       _editor.scroll_up_one_track();
-                       return true;
-               }
+               } 
                break;
 
        case GDK_SCROLL_DOWN:
@@ -312,10 +309,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (true);
                        return true;
-               } else if (Keyboard::no_modifiers_active (ev->state)) {
-                       _editor.scroll_down_one_track();
-                       return true;
-               }
+               } 
                break;
 
        default:
@@ -323,7 +317,14 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                break;
        }
 
-       return false;
+       /* Just forward to the normal canvas scroll method. The coordinate
+          systems are different but since the canvas is always larger than the
+          track headers, and aligned with the trackview area, this will work.
+
+          In the not too distant future this layout is going away anyway and
+          headers will be on the canvas.
+       */
+       return _editor.canvas_scroll_event (ev, false);
 }
 
 bool
@@ -1151,9 +1152,12 @@ TimeAxisView::color_handler ()
 }
 
 /** @return Pair: TimeAxisView, layer index.
- * TimeAxisView is non-0 if this object covers y, or one of its children does.
+ * TimeAxisView is non-0 if this object covers @param y, or one of its children
+ * does. @param y is an offset from the top of the trackview area.
+ *
  * If the covering object is a child axis, then the child is returned.
  * TimeAxisView is 0 otherwise.
+ *
  * Layer index is the layer number (possibly fractional) if the TimeAxisView is valid
  * and is in stacked or expanded * region display mode, otherwise 0.
  */