X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fd07ec4a3d617bb1ee1f7ebdf6791014586efd84..0a56365ae618f4a2fa5da5bc6988cf08e2e45365:/lib/python/Components/Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index 211b772c..f6ecaf0c 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,21 +1,10 @@
-from ConditionalWidget import *
+from ConditionalWidget import ConditionalWidget
+from GUIComponent import GUIComponent
 
-from enigma import *
+from enigma import ePixmap, eTimer
 
-class Pixmap(Widget):
-	def __init__(self):
-		Widget.__init__(self)
-
-	def getePixmap(self, parent):
-		#pixmap = ePixmap(parent)
-		#pixmap.setPixmapFromFile(self.filename)
-		return ePixmap(parent)
-	
-	def createWidget(self, parent):
-		return self.getePixmap(parent)
-
-	def removeWidget(self, w):
-		pass
+class Pixmap(GUIComponent):
+	GUI_WIDGET = ePixmap
 
 class PixmapConditional(ConditionalWidget, Pixmap):
 	def __init__(self, withTimer = True):
@@ -35,7 +24,7 @@ class MovingPixmap(Pixmap):
 		self.clearPath()
 		
 		self.moveTimer = eTimer()
-		self.moveTimer.timeout.get().append(self.doMove)
+		self.moveTimer.callback.append(self.doMove)
 		
 	def clearPath(self, repeated = False):
 		if (self.moving):