From 9e482fd5f890b0a786dd9ef5bcc446ecdf07a693 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Tue, 2 Dec 2014 23:38:39 +0200
Subject: [PATCH] [Summary] Adding "state" for CairoWidget

---
 gtk2_ardour/ui/editor_window.xml |  2 +-
 gtk2_ardour/waves_ui.cc          | 46 +++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 9df0a97e0b..0a1ebfc553 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -236,7 +236,7 @@
                           width="79" height="25"
                           normalicon="mode_stereo_out"
                           activeicon="mode_stereo_out_active"
-                          active="true"/>
+                          state="active"/>
               <iconbutton id="mode_multi_out_button"
                           tooltip="Multi Out Mode"
                           width="79" height="25"
diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index cb515ba666..5fb03d0f88 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -657,23 +657,38 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 
 	property = xml_property (definition, "state", styles, "");
 	if (!property.empty ()) {
-		Gtk::StateType state = Gtk::STATE_NORMAL; 
-		if (property == "normal") {
-			state = Gtk::STATE_NORMAL;
-		} else if (property == "active") {
-			state = Gtk::STATE_ACTIVE;
-		} else if (property == "prelight") {
-			state = Gtk::STATE_PRELIGHT;
-		} else if (property == "selected") {
-			state = Gtk::STATE_SELECTED;
-		} else if (property == "insensitive") {
-			state = Gtk::STATE_INSENSITIVE;
-		} else if (property == "disabled") {
-			state = Gtk::STATE_INSENSITIVE;
+		CairoWidget* cairo_widget = dynamic_cast<CairoWidget*> (&widget);
+		if (cairo_widget) {
+			Gtkmm2ext::ActiveState state = Gtkmm2ext::Off;
+			if (property == "normal") {
+				state = Gtkmm2ext::Off;
+			} else if (property == "active") {
+				state = Gtkmm2ext::ExplicitActive;
+			} else if (property == "impliciactive") {
+				state = Gtkmm2ext::ImplicitActive;
+			} else {
+				dbg_msg ("Invalid state for CairoWidget !");
+			}
+			cairo_widget->set_active_state (state);
 		} else {
-			dbg_msg ("Invalid state for Gtk::Widget !");
+			Gtk::StateType state = Gtk::STATE_NORMAL; 
+			if (property == "normal") {
+				state = Gtk::STATE_NORMAL;
+			} else if (property == "active") {
+				state = Gtk::STATE_ACTIVE;
+			} else if (property == "prelight") {
+				state = Gtk::STATE_PRELIGHT;
+			} else if (property == "selected") {
+				state = Gtk::STATE_SELECTED;
+			} else if (property == "insensitive") {
+				state = Gtk::STATE_INSENSITIVE;
+			} else if (property == "disabled") {
+				state = Gtk::STATE_INSENSITIVE;
+			} else {
+				dbg_msg ("Invalid state for Gtk::Widget !");
+			}
+			widget.set_state (state);
 		}
-		widget.set_state (state);
 	}
 
 #if defined (PLATFORM_WINDOWS)
@@ -814,7 +829,6 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 	if (button) {
 		button->set_border_width (xml_property (definition, "borderwidth", styles, "0").c_str());
 		button->set_border_color (xml_property (definition, "bordercolor", styles, "#000000").c_str());
-		button->set_active (xml_property (definition, "active", styles, false));
 		button->set_toggleable (xml_property (definition, "toggleable", styles, false));
 	}