aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu/frame.cpp
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-04-23 11:43:21 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:47 +0100
commitb3f87944ba62ee82684f30fc89d8bbd5cf472b48 (patch)
tree0099a83f05ae70506c1355fc2f3c7c29803664cd /src/menu/frame.cpp
parentf2b29d039424262426fd4598ce076f54e31854cf (diff)
downloadusdx-b3f87944ba62ee82684f30fc89d8bbd5cf472b48.tar.gz
usdx-b3f87944ba62ee82684f30fc89d8bbd5cf472b48.tar.xz
usdx-b3f87944ba62ee82684f30fc89d8bbd5cf472b48.zip
added parent to control
parent is used to delete the objects if the parent is deleted
Diffstat (limited to 'src/menu/frame.cpp')
-rw-r--r--src/menu/frame.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp
index 8707f0cc..665a2627 100644
--- a/src/menu/frame.cpp
+++ b/src/menu/frame.cpp
@@ -28,11 +28,13 @@
namespace usdx
{
- Frame::Frame() : background(NULL)
+ Frame::Frame(Control* parent)
+ : Container(parent), background(NULL)
{
}
- Frame::Frame(FrameBackground* background) : background(background)
+ Frame::Frame(Control* parent, FrameBackground* background)
+ : Container(parent), background(background)
{
}