aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-03-22 16:33:56 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:51 +0100
commitbbdbced8470bc374e79a5d5914291f8ff7dc3dc3 (patch)
tree65f879996488015d7501fae5be1304b7fa167842 /src
parentae371c8561192bcf52459d225314ac7b83a7feaa (diff)
downloadusdx-bbdbced8470bc374e79a5d5914291f8ff7dc3dc3.tar.gz
usdx-bbdbced8470bc374e79a5d5914291f8ff7dc3dc3.tar.xz
usdx-bbdbced8470bc374e79a5d5914291f8ff7dc3dc3.zip
frames/loading_frame: added application as parent to be able to get size
Diffstat (limited to 'src')
-rw-r--r--src/frames/loading_frame.cpp4
-rw-r--r--src/frames/loading_frame.hpp3
2 files changed, 4 insertions, 3 deletions
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 <log4cpp/Category.hh>
namespace usdx
@@ -38,7 +39,7 @@ namespace usdx
static log4cpp::Category& log;
public:
- LoadingFrame();
+ LoadingFrame(Application*);
virtual ~LoadingFrame();
};
};