fix compiler warnings.

[ardour.git] / gtk2_ardour / canvas-flag.cc

diff --git a/gtk2_ardour/canvas-flag.cc b/gtk2_ardour/canvas-flag.cc
index d77de07359135ff5d920c729694fee80ebfdd2cc..fd000f2a853faf7a588259eee373b469ce824054 100644 (file)
--- a/gtk2_ardour/canvas-flag.cc
+++ b/gtk2_ardour/canvas-flag.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <iostream>
 
 #include "gtkmm2ext/utils.h"
@@ -5,6 +24,7 @@
 
 #include "ardour_ui.h"
 #include "canvas-flag.h"
+#include "canvas-noevent-pixbuf.h"
 #include "time_axis_view_item.h"
 #include "utils.h"
 
@@ -28,7 +48,6 @@ CanvasFlag::CanvasFlag (MidiRegionView& region,
        , _line(0)
        , _rect(0)
 {
-       signal_event().connect (sigc::mem_fun (*this, &CanvasFlag::on_event));
 }
 
 void
@@ -49,7 +68,7 @@ CanvasFlag::set_text (const string& text)
 {
        delete_allocated_objects();
 
-       _name_pixbuf = new ArdourCanvas::Pixbuf (*this);
+       _name_pixbuf = new ArdourCanvas::NoEventPixbuf (*this);
        name_pixbuf_width = Gtkmm2ext::pixel_width (text, TimeAxisViewItem::NAME_FONT) + 2;
        Gdk::Color c;
        set_color (c, _outline_color_rgba);
@@ -75,15 +94,6 @@ CanvasFlag::~CanvasFlag()
        delete_allocated_objects();
 }
 
-bool
-CanvasFlag::on_event(GdkEvent* /*ev*/)
-{
-       /* XXX if you change this function to actually do anything, be sure
-          to fix the connections commented out elsewhere in this file.
-       */
-       return false;
-}
-
 void
 CanvasFlag::set_height (double h)
 {