Fix yet another oversight for the windows icon file update

[ardour.git] / gtk2_ardour / patch_change.cc

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index 1bcf8d940ee684d0e4b36329be2d739068daa5ef..fb3507ae6454dbb3a2c4dc69bcc43930a502fffe 100644 (file)
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -30,11 +30,11 @@
 
 #include "canvas/debug.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_drag.h"
 #include "midi_region_view.h"
 #include "patch_change.h"
+#include "ui_config.h"
 
 using namespace MIDI::Name;
 using namespace std;
@@ -49,7 +49,9 @@ PatchChange::PatchChange(MidiRegionView&                   region,
                          double                            x,
                          double                            y,
                          ARDOUR::InstrumentInfo&           info,
-                         ARDOUR::MidiModel::PatchChangePtr patch)
+                         ARDOUR::MidiModel::PatchChangePtr patch,
+                        ArdourCanvas::Color               outline_color,
+                        ArdourCanvas::Color               fill_color)
        : _region (region)
        , _info (info)
        , _patch (patch)
@@ -58,15 +60,15 @@ PatchChange::PatchChange(MidiRegionView&                   region,
        _flag = new ArdourCanvas::Flag (
                parent,
                height,
-               ARDOUR_UI::config()->color ("midi patch change outline"),
-               ARDOUR_UI::config()->color_mod ("midi patch change fill", "midi patch change fill"),
+               outline_color,
+               fill_color,
                ArdourCanvas::Duple (x, y),
                true);
-       
+
        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_font_description (UIConfiguration::instance().get_SmallFont());
        _flag->set_text(text);
 }
 
@@ -82,7 +84,7 @@ PatchChange::initialize_popup_menus()
 
        boost::shared_ptr<ChannelNameSet> channel_name_set = _info.get_patches (_patch->channel());
 
-       if (!channel_name_set) {
+       if (!channel_name_set || channel_name_set->patch_banks().size () == 0) {
                return;
        }
 
@@ -98,12 +100,12 @@ PatchChange::initialize_popup_menus()
                     ++bank) {
                        Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
                        std::string replacement(" ");
-                       
+
                        Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
-                       
+
                        const PatchNameList& patches = (*bank)->patch_name_list();
                        Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
-               
+
                        for (PatchNameList::const_iterator patch = patches.begin();
                             patch != patches.end();
                             ++patch) {
@@ -131,13 +133,13 @@ PatchChange::initialize_popup_menus()
 
                const PatchNameList& patches = patch_banks.front()->patch_name_list();
                Gtk::Menu::MenuList& patch_menus = _popup.items();
-               
+
                for (PatchNameList::const_iterator patch = patches.begin();
                     patch != patches.end();
                     ++patch) {
                        std::string name = (*patch)->name();
                        boost::replace_all (name, "_", " ");
-                       
+
                        patch_menus.push_back (
                                Gtk::Menu_Helpers::MenuElem (
                                        name,
@@ -158,7 +160,7 @@ PatchChange::event_handler (GdkEvent* ev)
 {
        /* XXX: icky dcast */
        Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
-       
+
        if (!e->internal_editing()) {
                return false;
        }
@@ -176,14 +178,14 @@ PatchChange::event_handler (GdkEvent* ev)
 
                                _region.edit_patch_change (this);
                                return true;
-                               
+
                        } else if (ev->button.button == 1) {
                                e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
                                return true;
                        }
                }
 
-               if (ev->button.button == 3) {
+               if (Gtkmm2ext::Keyboard::is_context_menu_event (&ev->button)) {
                        if (!_popup_initialized) {
                                initialize_popup_menus();
                                _popup_initialized = true;