commit 21ff02a69331fbcd53dc93a1af9a93618225b4bf
author Ethan Yonker <dees_troy@teamw.in> Wed Feb 18 14:35:00 2015 -0600
committer Ethan Yonker <dees_troy@teamw.in> Sat Feb 21 08:14:24 2015 -0600
tree 623fe5a07a506362b91a16b34d62a875b3d45c32
parent 10ec0175c8270f223b5fbcdcd1b8299d012eaa57

GUI: Support styles in xml to reduce xml file size

Also allow sliders to have their own text label instead of
requiring a whole separate text object for the label in the xml.

Change-Id: I6e314efb4bb454d496555ff7e003d743063a1308

gui/action.cpp

diff --git a/gui/action.cpp b/gui/action.cpp
index aa81dff..f9de4e9 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -226,9 +226,9 @@
 	}
 
 	// First, get the action
-	actions = node->first_node("actions");
-	if (actions)	child = actions->first_node("action");
-	else			child = node->first_node("action");
+	actions = FindNode(node, "actions");
+	if (actions)	child = FindNode(actions, "action");
+	else			child = FindNode(node, "action");
 
 	if (!child) return;
 
@@ -247,7 +247,7 @@
 	}
 
 	// Now, let's get either the key or region
-	child = node->first_node("touch");
+	child = FindNode(node, "touch");
 	if (child)
 	{
 		attr = child->first_attribute("key");