From bbdbced8470bc374e79a5d5914291f8ff7dc3dc3 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 22 Mar 2012 16:33:56 +0100 Subject: frames/loading_frame: added application as parent to be able to get size --- src/frames/loading_frame.cpp | 4 ++-- src/frames/loading_frame.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/frames') diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp index 48996f1f..3be2af76 100644 --- a/src/frames/loading_frame.cpp +++ b/src/frames/loading_frame.cpp @@ -33,8 +33,8 @@ namespace usdx log4cpp::Category& LoadingFrame::log = log4cpp::Category::getInstance("usdx.frames.loading_frame"); - LoadingFrame::LoadingFrame() : - Frame(NULL) + LoadingFrame::LoadingFrame(Application* app) : + Frame(app) { // RgbColor background(100, 100, 100); // set_background(new FrameBackgroundColor(background)); diff --git a/src/frames/loading_frame.hpp b/src/frames/loading_frame.hpp index 5c698d88..f72c2761 100644 --- a/src/frames/loading_frame.hpp +++ b/src/frames/loading_frame.hpp @@ -28,6 +28,7 @@ #define LOADING_FRAME_HPP #include "menu/frame.hpp" +#include "menu/application.hpp" #include namespace usdx @@ -38,7 +39,7 @@ namespace usdx static log4cpp::Category& log; public: - LoadingFrame(); + LoadingFrame(Application*); virtual ~LoadingFrame(); }; }; -- cgit v1.2.3