From 763c2054510fc5db5020c7f82bf41a1d53c4c259 Mon Sep 17 00:00:00 2001 From: Lukas Aldershaab Date: Sun, 18 Oct 2020 02:25:44 +0200 Subject: [PATCH] Add type of Children in SimGroup and GuiControl --- Engine/source/console/simSet.cpp | 2 +- Engine/source/console/simSet.h | 1 + Engine/source/gui/core/guiControl.cpp | 2 +- Engine/source/gui/core/guiControl.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Engine/source/console/simSet.cpp b/Engine/source/console/simSet.cpp index 67d22b5fd..06024c2c6 100644 --- a/Engine/source/console/simSet.cpp +++ b/Engine/source/console/simSet.cpp @@ -37,7 +37,7 @@ #include "math/mMathFn.h" -IMPLEMENT_CONOBJECT( SimSet ); +IMPLEMENT_CONOBJECT_CHILDREN( SimSet ); IMPLEMENT_CONOBJECT( SimGroup ); ConsoleDocClass( SimSet, diff --git a/Engine/source/console/simSet.h b/Engine/source/console/simSet.h index 441180d18..01f636662 100644 --- a/Engine/source/console/simSet.h +++ b/Engine/source/console/simSet.h @@ -95,6 +95,7 @@ class SimSet : public SimObject, public TamlChildren public: typedef SimObject Parent; + typedef SimObject Children; enum SetModification { diff --git a/Engine/source/gui/core/guiControl.cpp b/Engine/source/gui/core/guiControl.cpp index e47404799..7e0f27791 100644 --- a/Engine/source/gui/core/guiControl.cpp +++ b/Engine/source/gui/core/guiControl.cpp @@ -44,7 +44,7 @@ //#define DEBUG_SPEW -IMPLEMENT_CONOBJECT( GuiControl ); +IMPLEMENT_CONOBJECT_CHILDREN( GuiControl ); ConsoleDocClass( GuiControl, "@brief Base class for all Gui control objects.\n\n" diff --git a/Engine/source/gui/core/guiControl.h b/Engine/source/gui/core/guiControl.h index eae37a8df..997213f75 100644 --- a/Engine/source/gui/core/guiControl.h +++ b/Engine/source/gui/core/guiControl.h @@ -107,6 +107,7 @@ class GuiControl : public SimGroup public: typedef SimGroup Parent; + typedef GuiControl Children; friend class GuiWindowCtrl; // mCollapseGroupVec friend class GuiCanvas;