projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...
[ardour.git]
/
gtk2_ardour
/
canvas-flag.cc
diff --git
a/gtk2_ardour/canvas-flag.cc
b/gtk2_ardour/canvas-flag.cc
index c40bf456483d5d65e0235fa513ef9c88b6aac1e2..813c0b1468a34da2e7b89a2b626823340596077b 100644
(file)
--- a/
gtk2_ardour/canvas-flag.cc
+++ b/
gtk2_ardour/canvas-flag.cc
@@
-5,32
+5,25
@@
using namespace Gnome::Canvas;
using namespace std;
using namespace Gnome::Canvas;
using namespace std;
-
void
CanvasFlag::delete_allocated_objects()
{
void
CanvasFlag::delete_allocated_objects()
{
- if (_text) {
- delete _text;
- _text = 0;
- }
-
- if (_line) {
- delete _line;
- _line = 0;
- }
-
- if (_rect) {
- delete _rect;
- _rect = 0;
- }
+ delete _text;
+ _text = 0;
+
+ delete _line;
+ _line = 0;
+
+ delete _rect;
+ _rect = 0;
}
void
}
void
-CanvasFlag::set_text(string& a_text)
+CanvasFlag::set_text(
const
string& a_text)
{
delete_allocated_objects();
{
delete_allocated_objects();
- _text = new
Text(*
this, 0.0, 0.0, Glib::ustring(a_text));
+ _text = new
InteractiveText(*this,
this, 0.0, 0.0, Glib::ustring(a_text));
_text->property_justification() = Gtk::JUSTIFY_CENTER;
_text->property_fill_color_rgba() = _outline_color_rgba;
double flagwidth = _text->property_text_width() + 10.0;
_text->property_justification() = Gtk::JUSTIFY_CENTER;
_text->property_fill_color_rgba() = _outline_color_rgba;
double flagwidth = _text->property_text_width() + 10.0;
@@
-40,11
+33,10
@@
CanvasFlag::set_text(string& a_text)
_text->show();
_line = new SimpleLine(*this, 0.0, 0.0, 0.0, _height);
_line->property_color_rgba() = _outline_color_rgba;
_text->show();
_line = new SimpleLine(*this, 0.0, 0.0, 0.0, _height);
_line->property_color_rgba() = _outline_color_rgba;
- _rect = new
SimpleRect(*
this, 0.0, 0.0, flagwidth, flagheight);
+ _rect = new
InteractiveRect(*this,
this, 0.0, 0.0, flagwidth, flagheight);
_rect->property_outline_color_rgba() = _outline_color_rgba;
_rect->property_fill_color_rgba() = _fill_color_rgba;
_rect->property_outline_color_rgba() = _outline_color_rgba;
_rect->property_fill_color_rgba() = _fill_color_rgba;
- _text->lower_to_bottom();
- _text->raise(2);
+ _text->raise_to_top();
}
CanvasFlag::~CanvasFlag()
}
CanvasFlag::~CanvasFlag()
@@
-52,3
+44,8
@@
CanvasFlag::~CanvasFlag()
delete_allocated_objects();
}
delete_allocated_objects();
}
+bool
+CanvasFlag::on_event(GdkEvent* /*ev*/)
+{
+ return false;
+}