diff options
Diffstat (limited to '')
| -rw-r--r-- | src/menu/frame.cpp | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp index cbf073f5..ae529444 100644 --- a/src/menu/frame.cpp +++ b/src/menu/frame.cpp @@ -32,12 +32,12 @@ namespace usdx log4cpp::Category::getInstance("usdx.menu.frame"); Frame::Frame(Container* parent) - : Container(parent, FrameContainerHelper(this)), background(NULL) + : Container(parent, FrameContainerHelper(this)) { } - Frame::Frame(Container* parent, FrameBackground* background) - : Container(parent, FrameContainerHelper(this)), background(background) + Frame::Frame(Container* parent, Background* background) + : Container(parent, FrameContainerHelper(this)) { } @@ -47,34 +47,6 @@ namespace usdx parent->removeFrame(); parent = NULL; } - - if (background) { - delete background; - background = NULL; - } - } - - void Frame::set_background(FrameBackground* background) - { - if (this->background) { - delete this->background; - } - - this->background = background; - } - - const FrameBackground* Frame::get_background(void) const - { - return background; - } - - void Frame::draw(void) - { - if (background) { - background->repaint(); - } - - Container::draw(); } Frame::FrameContainerHelper::FrameContainerHelper(Frame* self) : |