LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Paul Davis 2010-05-21 14:15:25 +00:00
parent 5e0ce8a7f0
commit 39e953ecb2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_selection.cc
View File

@ -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());

2
gtk2_ardour/imageframe_socket_handler.cc
View File

@ -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) ;

4
gtk2_ardour/time_axis_view.cc
View File

@ -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

2
gtk2_ardour/time_axis_view.h
View File

@ -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