cleaned up ugly hack related to activate events and suspend/resume -- jvr

Mac/Lib/FrameWork.py

@@ -357,11 +357,7 @@ class Application:
 	
 	def do_activateEvt(self, event):
 		(what, message, when, where, modifiers) = event
-		# XXXX Incorrect, should be fixed in suspendresume
-		if type(message) == type(1):
 		wid = WhichWindow(message)
-		else:
-			wid = message
 		if wid and self._windows.has_key(wid):
 			window = self._windows[wid]
 			window.do_activate(modifiers & 1, event)
@@ -379,13 +375,11 @@ class Application:
 				self.printevent(event)
 	
 	def do_suspendresume(self, event):
-		# Is this a good idea???
 		(what, message, when, where, modifiers) = event
-		w = FrontWindow()
-		if w:
-			# XXXX Incorrect, should stuff windowptr into message field
-			nev = (activateEvt, w, when, where, message&1)
-			self.do_activateEvt(nev)
+		wid = FrontWindow()
+		if wid and self._windows.has_key(wid):
+			window = self._windows[wid]
+			window.do_activate(modifiers & 1, event)
 	
 	def do_kHighLevelEvent(self, event):
 		(what, message, when, where, modifiers) = event