projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #1637 (needs merging to 2.0.1 branch); remove debug printf
[ardour.git]
/
gtk2_ardour
/
axis_view.h
diff --git
a/gtk2_ardour/axis_view.h
b/gtk2_ardour/axis_view.h
index e0ad68e5c9e183ba30a3881162bbda87fc379f9b..51f744c4e550e7cbd38fadb5a70d6ca7fb1f89d0 100644
(file)
--- a/
gtk2_ardour/axis_view.h
+++ b/
gtk2_ardour/axis_view.h
@@
-15,16
+15,19
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __ardour_gtk_axis_view_h__
#define __ardour_gtk_axis_view_h__
#include <list>
*/
#ifndef __ardour_gtk_axis_view_h__
#define __ardour_gtk_axis_view_h__
#include <list>
-#include <gtkmm.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
#include <pbd/xml++.h>
#include "prompter.h"
#include <pbd/xml++.h>
#include "prompter.h"
+#include "selectable.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-34,7
+37,7
@@
namespace ARDOUR {
* AxisView defines the abstract base class for time-axis trackviews and routes.
*
*/
* AxisView defines the abstract base class for time-axis trackviews and routes.
*
*/
-class AxisView : public virtual
sigc::track
able
+class AxisView : public virtual
Select
able
{
public:
/**
{
public:
/**
@@
-48,12
+51,6
@@
class AxisView : public virtual sigc::trackable
virtual string name() const = 0;
virtual string name() const = 0;
- virtual void set_selected (bool yn) {
- if (yn != _selected) {
- _selected = yn;
- }
- }
-
virtual bool marked_for_display() const { return _marked_for_display; }
virtual void set_marked_for_display (bool yn) {
virtual bool marked_for_display() const { return _marked_for_display; }
virtual void set_marked_for_display (bool yn) {
@@
-62,7
+59,6
@@
class AxisView : public virtual sigc::trackable
}
}
}
}
- virtual bool selected() const { return _selected; }
sigc::signal<void> Hiding;
sigc::signal<void> GoingAway;
sigc::signal<void> Hiding;
sigc::signal<void> GoingAway;
@@
-87,8
+83,6
@@
class AxisView : public virtual sigc::trackable
Gtk::Label name_label;
Gtk::Label name_label;
- bool _selected;
-
bool _marked_for_display;
}; /* class AxisView */
bool _marked_for_display;
}; /* class AxisView */