fix up requested color names everywhere.

[ardour.git] / gtk2_ardour / patch_change.cc

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index a029563f0f6a207a044f137a0d816b2a908a1ebb..530f903bad520c6266101ee143f06f087ec828d2 100644 (file)
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -26,7 +26,7 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/midi_patch_manager.h"
+#include "midi++/midnam_patch.h"
 
 #include "canvas/debug.h"
 
@@ -43,7 +43,7 @@ using namespace std;
  */
 PatchChange::PatchChange(
                MidiRegionView& region,
-               ArdourCanvas::Layout* parent,
+               ArdourCanvas::Container* parent,
                const string&   text,
                double          height,
                double          x,
@@ -58,14 +58,15 @@ PatchChange::PatchChange(
        _flag = new ArdourCanvas::Flag (
                parent,
                height,
-               ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline(),
-               ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill(),
+               ARDOUR_UI::config()->color ("midi patch change outline"),
+               ARDOUR_UI::config()->color ("midi patch change fill"),
                ArdourCanvas::Duple (x, y)
                );
        
        CANVAS_DEBUG_NAME (_flag, text);
 
        _flag->Event.connect (sigc::mem_fun (*this, &PatchChange::event_handler));
+       _flag->set_font_description (ARDOUR_UI::config()->get_SmallFont());
        _flag->set_text(text);
 }
 
@@ -158,9 +159,14 @@ PatchChange::event_handler (GdkEvent* ev)
        /* XXX: icky dcast */
        Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
 
+       if (!e->internal_editing()) {
+               // not in internal edit mode, so no patch change editing
+               return false;
+       }
+
        switch (ev->type) {
        case GDK_BUTTON_PRESS:
-               if (e->current_mouse_mode() == Editing::MouseObject && e->internal_editing()) {
+               if (e->current_mouse_mode() == Editing::MouseObject) {
 
                        if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {