Move "Feedback" option to control-portocol settings

[ardour.git] / libs / gtkmm2ext / utils.cc

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 4ba85e2f25250ee3bde55bb13653abe3456f31ed..c18023e02008d7429b8d0c5fa24979cbe966b404 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -314,7 +314,6 @@ _position_menu_anchored (int& x, int& y, bool& push_in,
                                    const Gtk::Menu* const menu,
                                    Gtk::Widget* const anchor,
                                    const std::string& selected) {
-       using namespace Gdk;
        using namespace Gtk;
        using namespace Gtk::Menu_Helpers;
 
@@ -324,7 +323,7 @@ _position_menu_anchored (int& x, int& y, bool& push_in,
                return;
        }
 
-       Rectangle monitor;
+       Gdk::Rectangle monitor;
        {
                const int monitor_num = anchor->get_screen ()->get_monitor_at_window (
                                anchor->get_window ());
@@ -333,7 +332,7 @@ _position_menu_anchored (int& x, int& y, bool& push_in,
        }
 
        const Requisition menu_req = menu->size_request();
-       const Rectangle allocation = anchor->get_allocation();
+       const Gdk::Rectangle allocation = anchor->get_allocation();
 
        /* The x and y position are handled separately.
         *
@@ -396,7 +395,8 @@ _position_menu_anchored (int& x, int& y, bool& push_in,
 
        MenuList::const_iterator i = items.begin();
        for ( ; i != items.end(); ++i) {
-               if (selected == ((std::string) i->get_label())) {
+               const Label* label_widget = dynamic_cast<const Label*>(i->get_child());
+               if (label_widget && selected == ((std::string) label_widget->get_label())) {
                        break;
                }
                offset += i->size_request().height;