[Python-checkins] CVS: python/dist/src/Mac/Lib FrameWork.py,1.47,1.48

Jack Jansen jackjansen@users.sourceforge.net
Mon, 21 Jan 2002 15:01:26 -0800


Update of /cvsroot/python/python/dist/src/Mac/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv8323

Modified Files:
	FrameWork.py 
Log Message:
Changes by Donovan Preston (and a few minor ones by me) to make IDE run under 
MachoPython. Mainly making sure we don't call routines that don't exist.


Index: FrameWork.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/FrameWork.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** FrameWork.py	2001/12/13 12:57:11	1.47
--- FrameWork.py	2002/01/21 23:01:24	1.48
***************
*** 154,158 ****
  	def mainloop(self, mask = everyEvent, wait = None):
  		self.quitting = 0
! 		saveparams = apply(MacOS.SchedParams, self.schedparams)
  		try:
  			while not self.quitting:
--- 154,159 ----
  	def mainloop(self, mask = everyEvent, wait = None):
  		self.quitting = 0
! 		if hasattr(MacOS, 'SchedParams'):
! 			saveparams = apply(MacOS.SchedParams, self.schedparams)
  		try:
  			while not self.quitting:
***************
*** 165,169 ****
  					break
  		finally:
! 			apply(MacOS.SchedParams, saveparams)
  	
  	def dopendingevents(self, mask = everyEvent):
--- 166,171 ----
  					break
  		finally:
! 			if hasattr(MacOS, 'SchedParams'):
! 				apply(MacOS.SchedParams, saveparams)
  	
  	def dopendingevents(self, mask = everyEvent):
***************
*** 215,218 ****
--- 217,222 ----
  	def asyncevents(self, onoff):
  		"""asyncevents - Set asynchronous event handling on or off"""
+ 		if MacOS.runtimemodel == 'macho':
+ 			raise 'Unsupported in MachoPython'
  		old = self._doing_asyncevents
  		if old:
***************
*** 258,262 ****
  				# Not menubar or something, so assume someone
  				# else's window
! 				MacOS.HandleEvent(event)
  				return		
  		elif self._windows.has_key(wid):
--- 262,267 ----
  				# Not menubar or something, so assume someone
  				# else's window
! 				if hasattr(MacOS, 'HandleEvent'):
! 					MacOS.HandleEvent(event)
  				return		
  		elif self._windows.has_key(wid):
***************
*** 273,284 ****
  
  	def do_inSysWindow(self, partcode, window, event):
! 		MacOS.HandleEvent(event)
  	
  	def do_inDesk(self, partcode, window, event):
! 		MacOS.HandleEvent(event)
  	
  	def do_inMenuBar(self, partcode, window, event):
  		if not self.menubar:
! 			MacOS.HandleEvent(event)
  			return
  		(what, message, when, where, modifiers) = event
--- 278,292 ----
  
  	def do_inSysWindow(self, partcode, window, event):
! 		if hasattr(MacOS, 'HandleEvent'):
! 			MacOS.HandleEvent(event)
  	
  	def do_inDesk(self, partcode, window, event):
! 		if hasattr(MacOS, 'HandleEvent'):
! 			MacOS.HandleEvent(event)
  	
  	def do_inMenuBar(self, partcode, window, event):
  		if not self.menubar:
! 			if hasattr(MacOS, 'HandleEvent'):
! 				MacOS.HandleEvent(event)
  			return
  		(what, message, when, where, modifiers) = event
***************
*** 295,299 ****
  	
  	def do_menu(self, id, item, window, event):
! 		MacOS.OutputSeen()
  		self.menubar.dispatch(id, item, window, event)
  	
--- 303,308 ----
  	
  	def do_menu(self, id, item, window, event):
! 		if hasattr(MacOS, 'OutputSeen'):
! 			MacOS.OutputSeen()
  		self.menubar.dispatch(id, item, window, event)
  	
***************
*** 304,312 ****
  		if DEBUG: print "\tUnknown part code:", partcode
  		if DEBUG: print "\tEvent:", self.printevent(event)
! 		MacOS.HandleEvent(event)
  		
  	def do_unknownwindow(self, partcode, window, event):
  		if DEBUG: print 'Unknown window:', window
! 		MacOS.HandleEvent(event)
  	
  	def do_keyDown(self, event):
--- 313,323 ----
  		if DEBUG: print "\tUnknown part code:", partcode
  		if DEBUG: print "\tEvent:", self.printevent(event)
! 		if hasattr(MacOS, 'HandleEvent'):
! 			MacOS.HandleEvent(event)
  		
  	def do_unknownwindow(self, partcode, window, event):
  		if DEBUG: print 'Unknown window:', window
! 		if hasattr(MacOS, 'HandleEvent'):
! 			MacOS.HandleEvent(event)
  	
  	def do_keyDown(self, event):
***************
*** 333,337 ****
  			else:
  				if not self.menubar:
! 					MacOS.HandleEvent(event)
  				return
  		else:
--- 344,349 ----
  			else:
  				if not self.menubar:
! 					if hasattr(MacOS, 'HandleEvent'):
! 						MacOS.HandleEvent(event)
  				return
  		else:
***************
*** 357,361 ****
  			window.do_rawupdate(wid, event)
  		else:
! 			MacOS.HandleEvent(event)
  	
  	def do_activateEvt(self, event):
--- 369,374 ----
  			window.do_rawupdate(wid, event)
  		else:
! 			if hasattr(MacOS, 'HandleEvent'):
! 				MacOS.HandleEvent(event)
  	
  	def do_activateEvt(self, event):
***************
*** 366,370 ****
  			window.do_activate(modifiers & 1, event)
  		else:
! 			MacOS.HandleEvent(event)
  	
  	def do_osEvt(self, event):
--- 379,384 ----
  			window.do_activate(modifiers & 1, event)
  		else:
! 			if hasattr(MacOS, 'HandleEvent'):
! 				MacOS.HandleEvent(event)
  	
  	def do_osEvt(self, event):