Merge branch 'pootle-import' into experimental

[vuplus_dvbapp] / lib / gui / ewindow.cpp

diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index 112b82d..83e65ec 100644 (file)
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -16,7 +16,7 @@ eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
        
        ePtr<eWindowStyle> style;
        if (mgr)
-               mgr->getStyle(style);
+               mgr->getStyle(desktop->getStyleID(), style);
        
                /* when there is either no style manager or no style, revert to simple style. */
        if (!style)
@@ -52,6 +52,13 @@ std::string eWindow::getTitle() const
        return m_title;
 }
 
+void eWindow::setBackgroundColor(const gRGB &col)
+{
+               /* set background color for child, too */
+       eWidget::setBackgroundColor(col);
+       m_child->setBackgroundColor(col);
+}
+
 void eWindow::setFlag(int flags)
 {
        m_flags |= flags;