fix manual merge error

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 55d352bd0be082a3eaa960045103ef4d421e6eeb..68e29f57f818163996df01fad3d8d68727020aa1 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -309,6 +309,11 @@ ARDOUR_UI::setup_windows ()
                assert (act);
                action_script_call_btn[i].set_text (string_compose ("%1", i+1));
                action_script_call_btn[i].set_related_action (act);
+               if (act->get_sensitive ()) {
+                       action_script_call_btn[i].set_visual_state (Gtkmm2ext::VisualState (action_script_call_btn[i].visual_state() & ~Gtkmm2ext::Insensitive));
+               } else {
+                       action_script_call_btn[i].set_visual_state (Gtkmm2ext::VisualState (action_script_call_btn[i].visual_state() | Gtkmm2ext::Insensitive));
+               }
                const int row = i % 3;
                const int col = i / 3;
                action_script_table.attach (action_script_call_btn[i], col, col + 1, row, row + 1, EXPAND, EXPAND, 1, 1);
@@ -331,7 +336,7 @@ ARDOUR_UI::setup_windows ()
        const XMLNode* mnode = main_window_settings ();
 
        if (mnode) {
-               const XMLProperty* prop;
+               XMLProperty const * prop;
                gint x = -1;
                gint y = -1;
                gint w = -1;