diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-21 14:15:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-21 14:15:25 +0000 |
| commit | 39e953ecb2bb098492a7f7db7d830c8e4f70a633 (patch) | |
| tree | 378e94b966298005cb2f1fc3d89604d9efe8d9b9 | |
| parent | 5e0ce8a7f07afcede694e0e27e8be4edaf46e5c6 (diff) | |
rename overloaded-virtual method of TimeAxisView (::set_selected()) so as not to hide Selectable::set_selected()
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7131 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/imageframe_socket_handler.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index d329ca1252..fae1d383d3 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -829,7 +829,7 @@ Editor::track_selection_changed () } for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->set_selected ( *selection ); + (*i)->reflect_selected (*selection); } ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty()); diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc index 363094990d..133053617c 100644 --- a/gtk2_ardour/imageframe_socket_handler.cc +++ b/gtk2_ardour/imageframe_socket_handler.cc @@ -1077,7 +1077,7 @@ ImageFrameSocketHandler::handle_item_selected(const char* msg) } else { - ifv->set_selected(true) ; + ifv->set_selected (true); ifta->get_view()->set_selected_imageframe_view(iftag, ifv) ; thePublicEditor.scroll_timeaxis_to_imageframe_item(ifv) ; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 14a30bab47..d2363ba572 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -588,11 +588,11 @@ TimeAxisView::popup_size_menu (guint32 when) } void -TimeAxisView::set_selected (Selection &selection) +TimeAxisView::reflect_selected (Selection &selection) { //give children a chance to be selected for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_selected (selection); + (*i)->reflect_selected (selection); } //determine if I am in the selection diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 86721a55e2..80ec34ccad 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -155,7 +155,7 @@ class TimeAxisView : public virtual AxisView, public Stateful virtual void hide (); bool hidden() const { return _hidden; } - virtual void set_selected (Selection&); + virtual void reflect_selected (Selection&); /** * potential handler for entered events |