Commit 64350b46 authored by Just van Rossum's avatar Just van Rossum

- rearranged some imports

- removed default button drawing code: this doesn't work well
  under OSX. Needs to be replaced by SetWindowDefaultButton()
  calls, once we have those.
parent 2e9e71fe
from Carbon import Ctl from Carbon import Ctl, Controls
from Carbon import Controls from Carbon import Evt, Qd, Win
from Carbon import Win
import Wbase import Wbase
from Carbon import Qd
from Carbon import Evt
class ControlWidget(Wbase.ClickableWidget): class ControlWidget(Wbase.ClickableWidget):
...@@ -117,45 +115,21 @@ class Button(ControlWidget): ...@@ -117,45 +115,21 @@ class Button(ControlWidget):
if self._control and self._enabled <> onoff: if self._control and self._enabled <> onoff:
self._control.HiliteControl((not onoff) and 255) self._control.HiliteControl((not onoff) and 255)
self._enabled = onoff self._enabled = onoff
if self._isdefault and self._visible:
self.SetPort()
self.drawfatframe(onoff)
def activate(self, onoff): def activate(self, onoff):
self._activated = onoff self._activated = onoff
if self._enabled: if self._enabled:
self._control.HiliteControl((not onoff) and 255) self._control.HiliteControl((not onoff) and 255)
if self._isdefault and self._visible:
self.SetPort()
self.drawfatframe(onoff)
def show(self, onoff): def show(self, onoff):
ControlWidget.show(self, onoff) ControlWidget.show(self, onoff)
if self._isdefault:
self.drawfatframe(onoff and self._enabled)
def draw(self, visRgn = None): def draw(self, visRgn = None):
if self._visible: if self._visible:
self._control.Draw1Control() self._control.Draw1Control()
if self._isdefault and self._activated:
self.drawfatframe(self._enabled)
def drawfatframe(self, onoff):
state = Qd.GetPenState()
if onoff:
Qd.PenPat(Qd.qd.black)
else:
Qd.PenPat(Qd.qd.white)
fatrect = Qd.InsetRect(self._bounds, -4, -4)
Qd.PenSize(3, 3)
Qd.FrameRoundRect(fatrect, 16, 16)
Qd.SetPenState(state)
def _setdefault(self, onoff): def _setdefault(self, onoff):
self._isdefault = onoff self._isdefault = onoff
if self._control and self._enabled:
self.SetPort()
self.drawfatframe(onoff)
def adjust(self, oldbounds): def adjust(self, oldbounds):
if self._isdefault: if self._isdefault:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment