Conditional -> GUIObject and make all gui objects children of GUIObject

Signed-off-by: Vojtech Bocek <vbocek@gmail.com> Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522
2014-02-12 18:30:41 +01:00
parent f08ada8483
commit ede51c528e
19 changed files with 119 additions and 42 deletions
@@ -67,7 +67,7 @@ extern blanktimer blankTimer;
 void curtainClose(void);

 GUIAction::GUIAction(xml_node<>* node)
-	: Conditional(node)
+	: GUIObject(node)
 {
 	xml_node<>* child;
 	xml_node<>* actions;