X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b840d14b4c2c12e76af87fa3af784034e80bd0b4..8515e995db319835500cbcb4819d2a30a6155b8f:/lib/gui/ewindow.cpp

diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index 54a35958..112b82d7 100644
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -6,9 +6,10 @@
 
 #include <lib/gdi/epng.h>
 
-eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
+eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
 {
 	m_flags = 0;
+	m_desktop = desktop;
 		/* ask style manager for current style */
 	ePtr<eWindowStyleManager> mgr;
 	eWindowStyleManager::getInstance(mgr);
@@ -22,17 +23,20 @@ eWindow::eWindow(eWidgetDesktop *desktop): eWidget(0)
 		style = new eWindowStyleSimple();
 	
 	setStyle(style);
+	
+	setZPosition(z); /* must be done before addRootWidget */
 
 		/* we are the parent for the child window. */
 		/* as we are in the constructor, this is thread safe. */
 	m_child = this;
 	m_child = new eWidget(this);
-	desktop->addRootWidget(this, 0);
+	desktop->addRootWidget(this);
 }
 
 eWindow::~eWindow()
 {
-	getDesktop()->removeRootWidget(this);
+	m_desktop->removeRootWidget(this);
+	m_child->destruct();
 }
 
 void eWindow::setTitle(const std::string &string)