diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 14:01:44 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 14:01:44 +0100 |
| commit | c4d7f98e70694e471409cda6de03d0f3b5816f27 (patch) | |
| tree | 8cae9b3d3b6ee59a5a11da6f8702fc1ee2b1861a /main/enigma-gui.cpp | |
| parent | 7b2960a205f3c3e3b421d1664cd38644b3ffb679 (diff) | |
| parent | ed472ea627a958bc8dfb375ca03329624f1aed9c (diff) | |
| download | enigma2-c4d7f98e70694e471409cda6de03d0f3b5816f27.tar.gz enigma2-c4d7f98e70694e471409cda6de03d0f3b5816f27.zip | |
Merge branch 'obi/master'
Diffstat (limited to 'main/enigma-gui.cpp')
| -rw-r--r-- | main/enigma-gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp index e53fccab..f3d1b17d 100644 --- a/main/enigma-gui.cpp +++ b/main/enigma-gui.cpp @@ -8,7 +8,7 @@ #include <unistd.h> #include <lib/gdi/grc.h> -#include <lib/gdi/gfbdc.h> +#include <lib/gdi/gmaindc.h> #include <lib/gdi/font.h> #include <lib/gui/ewidget.h> @@ -52,8 +52,8 @@ int main() eInit init; init.setRunlevel(eAutoInitNumbers::main); - ePtr<gFBDC> my_dc; - gFBDC::getInstance(my_dc); + ePtr<gMainDC> my_dc; + gMainDC::getInstance(my_dc); gPainter p(my_dc); @@ -67,7 +67,7 @@ int main() 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); |