From ede51c528e5cebc7f1930d5c9da541e7d11c0138 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Fri, 7 Feb 2014 23:58:09 +0100 Subject: Conditional -> GUIObject and make all gui objects children of GUIObject Signed-off-by: Vojtech Bocek Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522 --- gui/action.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/action.cpp') diff --git a/gui/action.cpp b/gui/action.cpp index 9c785d169..951feb114 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -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; -- cgit v1.2.3