git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_723_infobarext_pvr'
[enigma2.git]
/
main
/
enigma-gui.cpp
diff --git
a/main/enigma-gui.cpp
b/main/enigma-gui.cpp
index e53fccab75cbe9220830bfc7422296c59af20cb8..f3d1b17dadd80b6d09f88bd28ee57d473895d349 100644
(file)
--- a/
main/enigma-gui.cpp
+++ b/
main/enigma-gui.cpp
@@
-8,7
+8,7
@@
#include <unistd.h>
#include <lib/gdi/grc.h>
#include <unistd.h>
#include <lib/gdi/grc.h>
-#include <lib/gdi/g
fb
dc.h>
+#include <lib/gdi/g
main
dc.h>
#include <lib/gdi/font.h>
#include <lib/gui/ewidget.h>
#include <lib/gdi/font.h>
#include <lib/gui/ewidget.h>
@@
-52,8
+52,8
@@
int main()
eInit init;
init.setRunlevel(eAutoInitNumbers::main);
eInit init;
init.setRunlevel(eAutoInitNumbers::main);
- ePtr<g
FB
DC> my_dc;
- g
FB
DC::getInstance(my_dc);
+ ePtr<g
Main
DC> my_dc;
+ g
Main
DC::getInstance(my_dc);
gPainter p(my_dc);
gPainter p(my_dc);
@@
-67,7
+67,7
@@
int main()
pal[a | 0x10] = (0x111111 * a) | 0xFF;
p.setPalette(pal, 0, 256);
pal[a | 0x10] = (0x111111 * a) | 0xFF;
p.setPalette(pal, 0, 256);
- fontRenderClass::getInstance()->AddFont(
FONTDIR "/arial.ttf"
, "Regular", 100);
+ fontRenderClass::getInstance()->AddFont(
eEnv::resolve("${datadir}/fonts/arial.ttf")
, "Regular", 100);
eWidgetDesktop dsk(eSize(720, 576));
dsk.setDC(my_dc);
eWidgetDesktop dsk(eSize(720, 576));
dsk.setDC(my_dc);