yes! ich habs kaputt gemacht! (doesn't compile anymore, doesn't work anymore,

[enigma2.git] / lib / gui / elabel.cpp

diff --git a/lib/gui/elabel.cpp b/lib/gui/elabel.cpp
index ae04eb466ccbebe4cba8db530a0ad750d0859df5..ce4efaf17f02b505bbb3c76e4d2fb504d11695de 100644 (file)
--- a/lib/gui/elabel.cpp
+++ b/lib/gui/elabel.cpp
@@ -84,7 +84,7 @@ void eLabel::redrawWidget(gPainter *target, const eRect &rc)
 /*     eDebug("decoStr = %s, text=%s, name=%s, %p left = %d, top = %d, width=%d, height = %d", strDeco?strDeco.c_str():"no", text?text.c_str():"no" , name?name.c_str():"no", this, this->getPosition().x(), this->getPosition().y(), this->getSize().width(), this->getSize().height() ); 
        eDebug("renderContext left = %d, top = %d, width = %d, height = %d", rc.left(), rc.top(), rc.width(), rc.height() );*/
 
-       target->clip( rc );
+       target->clip( gRegion(rc) );
        eRect area=eRect(ePoint(0, 0), ePoint(width(), height()));
 /*     eDebug("area left = %d, top = %d, width = %d, height = %d",
                area.left(), area.top(),
@@ -136,7 +136,7 @@ void eLabel::redrawWidget(gPainter *target, const eRect &rc)
                        target->setBackgroundColor(w->getBackgroundColor());
                }
                target->setFont(font);
-               target->renderPara(*para, ePoint( area.left(), area.top()+yOffs) );
+               target->renderPara(para, ePoint( area.left(), area.top()+yOffs) );
        }
        if (pixmap)
        {
@@ -146,7 +146,7 @@ void eLabel::redrawWidget(gPainter *target, const eRect &rc)
        }
        if (shortcutPixmap)
                target->blit(shortcutPixmap, 
-                               ePoint((area.height()-shortcutPixmap->x)/2, area.top()+(area.height()-shortcutPixmap->y)/2),
+                               ePoint((area.height()-shortcutPixmap->getSize().width())/2, area.top()+(area.height()-shortcutPixmap->getSize().height())/2),
                                eRect(),
                                gPixmap::blitAlphaTest);
        target->clippop();