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

Signed-off-by: Vojtech Bocek <vbocek@gmail.com> Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522
2014-02-07 23:58:09 +01:00
parent f08ada8483
commit ede51c528e
19 changed files with 119 additions and 42 deletions
@@ -43,7 +43,7 @@ extern "C" {
 #include "objects.hpp"

 GUIButton::GUIButton(xml_node<>* node)
-	: Conditional(node)
+	: GUIObject(node)
 {
 	xml_attribute<>* attr;
 	xml_node<>* child;