| commit | ede51c528e5cebc7f1930d5c9da541e7d11c0138 | [log] [tgz] |
|---|---|---|
| author | Vojtech Bocek <vbocek@gmail.com> | Fri Feb 07 23:58:09 2014 +0100 |
| committer | Gerrit Code Review <gerrit2@gerrit> | Wed Feb 12 18:30:41 2014 +0100 |
| tree | 6ea3d7b2a5881cc0489f0b72ffeacd6d4adf7348 | |
| parent | f08ada848363553087b51b59a0a3f883d3344c74 [diff] [blame] |
Conditional -> GUIObject and make all gui objects children of GUIObject Signed-off-by: Vojtech Bocek <vbocek@gmail.com> Change-Id: Ic0a7d6354dabe5919b83942f2f1aa0715625e522
diff --git a/gui/text.cpp b/gui/text.cpp index 7eb6c18..715880b 100644 --- a/gui/text.cpp +++ b/gui/text.cpp
@@ -26,7 +26,7 @@ #include "objects.hpp" GUIText::GUIText(xml_node<>* node) - : Conditional(node) + : GUIObject(node) { xml_attribute<>* attr; xml_node<>* child;