implement proper 'destroy' functions in Converter

[enigma2.git] / lib / python / Components / Label.py

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index 5ad071abbfcdb2843548836751c2ce0ccac95972..7e61275b228d7a4c2b0cce7517779ab3d6fa0a5a 100644 (file)
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -1,12 +1,12 @@
-from HTMLComponent import *
-from GUIComponent import *
-from VariableText import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from VariableText import VariableText
 
-from ConditionalWidget import *
+from ConditionalWidget import ConditionalWidget, BlinkingWidget, BlinkingWidgetConditional
 
 from enigma import eLabel
 
-class Label(HTMLComponent, GUIComponent, VariableText):
+class Label(VariableText, HTMLComponent, GUIComponent):
        def __init__(self, text=""):
                GUIComponent.__init__(self)
                VariableText.__init__(self)
@@ -17,9 +17,8 @@ class Label(HTMLComponent, GUIComponent, VariableText):
                return self.getText()
 
 # GUI:
-       def createWidget(self, parent):
-               return eLabel(parent)
-       
+       GUI_WIDGET = eLabel
+
        def getSize(self):
                s = self.instance.calculateSize()
                return (s.width(), s.height())
@@ -34,20 +33,7 @@ class BlinkingLabel(Label, BlinkingWidget):
                Label.__init__(text = text)
                BlinkingWidget.__init__()
 
-       def GUIcreate(self, parent):
-               LabelConditional.GUIcreate(self, parent)
-       
-       def GUIdelete(self):
-               LabelConditional.GUIcreate(self)
-               
 class BlinkingLabelConditional(BlinkingWidgetConditional, LabelConditional):
        def __init__(self, text = ""):
                LabelConditional.__init__(self, text = text)
                BlinkingWidgetConditional.__init__(self)
-               
-       def GUIcreate(self, parent):
-               LabelConditional.GUIcreate(self, parent)
-       
-       def GUIdelete(self):
-               LabelConditional.GUIcreate(self)
-               
\ No newline at end of file