use proper APIs for activate/deactivate

justvanrossum · justvanrossum · commit a73f78b6ec9a · 2001-11-02T21:12:52.000Z
diff --git a/Mac/Tools/IDE/Wcontrols.py b/Mac/Tools/IDE/Wcontrols.py
@@ -65,7 +65,10 @@ def show(self, onoff):
 	def activate(self, onoff):
 		self._activated = onoff
 		if self._enabled:
-			self._control.HiliteControl((not onoff) and 255)
+			if onoff:
+				self._control.ActivateControl()
+			else:
+				self._control.DeactivateControl()
 	
 	def draw(self, visRgn = None):
 		if self._visible:
@@ -105,7 +108,7 @@ def push(self):
 		if not self._enabled:
 			return
 		import time
-		self._control.HiliteControl(1)
+		self._control.HiliteControl(Controls.kControlButtonPart)
 		time.sleep(0.1)
 		self._control.HiliteControl(0)
 		if self._callback:
@@ -116,11 +119,6 @@ def enable(self, onoff):
 			self._control.HiliteControl((not onoff) and 255)
 			self._enabled = onoff
 	
-	def activate(self, onoff):
-		self._activated = onoff
-		if self._enabled:
-			self._control.HiliteControl((not onoff) and 255)
-	
 	def show(self, onoff):
 		ControlWidget.show(self, onoff)
 	
@@ -332,16 +330,6 @@ def adjust(self, oldbounds):
 				Qd.FrameRect(self._bounds)
 			self.GetWindow().ValidWindowRect(self._bounds)
 	
-	def activate(self, onoff):
-		self._activated = onoff
-		if self._visible:
-			if onoff:
-				self._control.ShowControl()
-			else:
-				self._control.HideControl()
-				self.draw(None)
-				self.GetWindow().ValidWindowRect(self._bounds)
-		
 	def set(self, value):
 		if self._control:
 			self._control.SetControlValue(value)
