git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add audioselection
[enigma2.git]
/
lib
/
gui
/
epixmap.cpp
diff --git
a/lib/gui/epixmap.cpp
b/lib/gui/epixmap.cpp
index a0655aa9df8c0a873cac8bde5b65e01c396c00c9..e4e4acc31300ac0f007ec8f6dcdddc65f24891c3 100644
(file)
--- a/
lib/gui/epixmap.cpp
+++ b/
lib/gui/epixmap.cpp
@@
-1,4
+1,6
@@
#include <lib/gui/epixmap.h>
#include <lib/gui/epixmap.h>
+#include <lib/gdi/epng.h>
+#include <lib/gui/ewidgetdesktop.h>
ePixmap::ePixmap(eWidget *parent): eWidget(parent)
{
ePixmap::ePixmap(eWidget *parent): eWidget(parent)
{
@@
-10,6
+12,15
@@
void ePixmap::setPixmap(gPixmap *pixmap)
event(evtChangedPixmap);
}
event(evtChangedPixmap);
}
+void ePixmap::setPixmapFromFile(const char *filename)
+{
+ loadPNG(m_pixmap, filename);
+
+ // TODO
+ getDesktop()->makeCompatiblePixmap(*m_pixmap);
+ event(evtChangedPixmap);
+}
+
int ePixmap::event(int event, void *data, void *data2)
{
switch (event)
int ePixmap::event(int event, void *data, void *data2)
{
switch (event)
@@
-20,7
+31,7
@@
int ePixmap::event(int event, void *data, void *data2)
getStyle(style);
getStyle(style);
-
eWidget::event(event, data, data2);
+
//
eWidget::event(event, data, data2);
gPainter &painter = *(gPainter*)data2;
if (m_pixmap)
gPainter &painter = *(gPainter*)data2;
if (m_pixmap)