aboutsummaryrefslogtreecommitdiff
path: root/lib/gui
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-03-02 02:14:10 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-03-02 02:14:10 +0000
commit6c2d3fc303542b7f77f4350974acf781a1b91c30 (patch)
tree356a431d479c5dff6fb6aaea8000bbb71a8c58d0 /lib/gui
parent0a3c667bfb6a1552975c1fd2325e7435363c2bc9 (diff)
downloadenigma2-6c2d3fc303542b7f77f4350974acf781a1b91c30.tar.gz
enigma2-6c2d3fc303542b7f77f4350974acf781a1b91c30.zip
minimally improved LCD support
Diffstat (limited to 'lib/gui')
-rw-r--r--lib/gui/epixmap.cpp4
-rw-r--r--lib/gui/ewidget.h2
-rw-r--r--lib/gui/ewindow.cpp3
-rw-r--r--lib/gui/ewindow.h1
4 files changed, 6 insertions, 4 deletions
diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 70ea9d6a..4e15b4eb 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -29,8 +29,8 @@ void ePixmap::setPixmapFromFile(const char *filename)
return;
}
- // TODO
- getDesktop()->makeCompatiblePixmap(*m_pixmap);
+ // TODO: This only works for desktop 0
+ getDesktop(0)->makeCompatiblePixmap(*m_pixmap);
event(evtChangedPixmap);
}
diff --git a/lib/gui/ewidget.h b/lib/gui/ewidget.h
index 6739f25e..3ddfdc26 100644
--- a/lib/gui/ewidget.h
+++ b/lib/gui/ewidget.h
@@ -113,6 +113,6 @@ public:
void setFocus(eWidget *focus);
};
-extern eWidgetDesktop *getDesktop();
+extern eWidgetDesktop *getDesktop(int which);
#endif
diff --git a/lib/gui/ewindow.cpp b/lib/gui/ewindow.cpp
index f8984729..112b82d7 100644
--- a/lib/gui/ewindow.cpp
+++ b/lib/gui/ewindow.cpp
@@ -9,6 +9,7 @@
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);
@@ -34,7 +35,7 @@ eWindow::eWindow(eWidgetDesktop *desktop, int z): eWidget(0)
eWindow::~eWindow()
{
- getDesktop()->removeRootWidget(this);
+ m_desktop->removeRootWidget(this);
m_child->destruct();
}
diff --git a/lib/gui/ewindow.h b/lib/gui/ewindow.h
index d36d9124..bb7f771c 100644
--- a/lib/gui/ewindow.h
+++ b/lib/gui/ewindow.h
@@ -32,6 +32,7 @@ private:
std::string m_title;
eWidget *m_child;
int m_flags;
+ eWidgetDesktop *m_desktop;
};
#endif