*** empty log message ***

diff --git a/Lib/lib-stdwin/Buttons.py b/Lib/lib-stdwin/Buttons.py
index b864c566a84189d5600a4d641a56d65066470311..d991c96a7b56afc22f5ecf663f43329be586a5b3 100644 (file)
--- a/Lib/lib-stdwin/Buttons.py
+++ b/Lib/lib-stdwin/Buttons.py
@@ -54,12 +54,9 @@ class LabelAppearance():
                        self.redraw()
        #
        def setbounds(self, bounds):
-               if self.bounds <> _rect.empty:
-                       self.parent.change(self.bounds)
                self.bounds = bounds
                if self.bounds <> _rect.empty:
                        self.recalc()
-                       self.parent.change(bounds)
        #
        def realize(self):
                pass
@@ -109,14 +106,15 @@ class LabelAppearance():
        #
        def redraw(self):
                if self.bounds <> _rect.empty:
-                       self.draw(self.parent.begindrawing(), self.bounds)
+                       d = self.parent.begindrawing()
+                       d.erase(self.bounds)
+                       self.draw(d, self.bounds)
        #
        def draw(self, (d, area)):
                area = _rect.intersect(area, self.bounds)
                if area = _rect.empty:
                        return
                d.cliprect(area)
-               d.erase(self.bounds)
                self.drawit(d)
                d.noclip()
        #
@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance():
        def drawpict(self, d):
                (left, top), (right, bottom) = self.boxbounds
                radius = self.size / 2
-               h, v = left + radius, top + radius
-               d.circle((h, v), radius)
+               center = left + radius, top + radius
+               d.circle(center, radius)
                if self.selected:
-                       some = radius/3
-                       d.paint((h-some, v-some), (h+some, v+some))
+                       d.fillcircle(center, radius*3/5)
        #
 
 

diff --git a/Lib/lib-stdwin/StripChart.py b/Lib/lib-stdwin/StripChart.py
index e97dae2778f1dac69563cd67808e77fa507266a5..67d7de170264550dba78c5ddd46fd1fb7896e47a 100644 (file)
--- a/Lib/lib-stdwin/StripChart.py
+++ b/Lib/lib-stdwin/StripChart.py
@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity():
        def draw(self, (d, area)):
                area = rect.intersect(area, self.bounds)
                if area = rect.empty:
-                       print 'mt'
                        return
                d.cliprect(area)
                d.erase(self.bounds)

diff --git a/Lib/stdwin/Buttons.py b/Lib/stdwin/Buttons.py
index b864c566a84189d5600a4d641a56d65066470311..d991c96a7b56afc22f5ecf663f43329be586a5b3 100755 (executable)
--- a/Lib/stdwin/Buttons.py
+++ b/Lib/stdwin/Buttons.py
@@ -54,12 +54,9 @@ class LabelAppearance():
                        self.redraw()
        #
        def setbounds(self, bounds):
-               if self.bounds <> _rect.empty:
-                       self.parent.change(self.bounds)
                self.bounds = bounds
                if self.bounds <> _rect.empty:
                        self.recalc()
-                       self.parent.change(bounds)
        #
        def realize(self):
                pass
@@ -109,14 +106,15 @@ class LabelAppearance():
        #
        def redraw(self):
                if self.bounds <> _rect.empty:
-                       self.draw(self.parent.begindrawing(), self.bounds)
+                       d = self.parent.begindrawing()
+                       d.erase(self.bounds)
+                       self.draw(d, self.bounds)
        #
        def draw(self, (d, area)):
                area = _rect.intersect(area, self.bounds)
                if area = _rect.empty:
                        return
                d.cliprect(area)
-               d.erase(self.bounds)
                self.drawit(d)
                d.noclip()
        #
@@ -203,11 +201,10 @@ class RadioAppearance() = CheckAppearance():
        def drawpict(self, d):
                (left, top), (right, bottom) = self.boxbounds
                radius = self.size / 2
-               h, v = left + radius, top + radius
-               d.circle((h, v), radius)
+               center = left + radius, top + radius
+               d.circle(center, radius)
                if self.selected:
-                       some = radius/3
-                       d.paint((h-some, v-some), (h+some, v+some))
+                       d.fillcircle(center, radius*3/5)
        #
 
 

diff --git a/Lib/stdwin/StripChart.py b/Lib/stdwin/StripChart.py
index e97dae2778f1dac69563cd67808e77fa507266a5..67d7de170264550dba78c5ddd46fd1fb7896e47a 100755 (executable)
--- a/Lib/stdwin/StripChart.py
+++ b/Lib/stdwin/StripChart.py
@@ -52,7 +52,6 @@ class StripChart() = LabelAppearance(), NoReactivity():
        def draw(self, (d, area)):
                area = rect.intersect(area, self.bounds)
                if area = rect.empty:
-                       print 'mt'
                        return
                d.cliprect(area)
                d.erase(self.bounds)