[pywin32-checkins] pywin32/Pythonwin/pywin/Demos progressbar.py, 1.1, 1.1.4.1 threadedgui.py, 1.3.4.1, 1.3.4.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1813/Pythonwin/pywin/Demos

Modified Files:
      Tag: py3k
	progressbar.py threadedgui.py 
Log Message:
merge various changes from the trunk

Index: threadedgui.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/threadedgui.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** threadedgui.py	29 Aug 2008 06:16:06 -0000	1.3.4.1
--- threadedgui.py	11 Dec 2008 07:06:51 -0000	1.3.4.2
***************
*** 9,12 ****
--- 9,13 ----
  
  from pywin.mfc import window, docview, thread
+ from pywin.mfc.thread import WinThread
  
  
***************
*** 104,112 ****
  
  
! class TestThread(thread.WinThread):
  	def __init__(self, parentWindow):
  		self.parentWindow = parentWindow
  		self.child = None
! 		thread.WinThread.__init__(self)
  	def InitInstance(self):
  		rect = self.parentWindow.GetClientRect()
--- 105,113 ----
  
  
! class TestThread(WinThread):
  	def __init__(self, parentWindow):
  		self.parentWindow = parentWindow
  		self.child = None
! 		WinThread.__init__(self)
  	def InitInstance(self):
  		rect = self.parentWindow.GetClientRect()
***************
*** 116,120 ****
  		self.child.Create("FontDemo", win32con.WS_CHILD | win32con.WS_VISIBLE, rect, self.parentWindow)
  		self.SetMainFrame(self.child)
! 		return thread.WinThread.InitInstance(self)
  
  	def ExitInstance(self):
--- 117,121 ----
  		self.child.Create("FontDemo", win32con.WS_CHILD | win32con.WS_VISIBLE, rect, self.parentWindow)
  		self.SetMainFrame(self.child)
! 		return WinThread.InitInstance(self)
  
  	def ExitInstance(self):

Index: progressbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/progressbar.py,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** progressbar.py	1 Sep 1999 23:33:35 -0000	1.1
--- progressbar.py	11 Dec 2008 07:06:51 -0000	1.1.4.1
***************
*** 87,91 ****
  if __name__=='__main__':
  	demo(1)
- 
- # $Header$
- 
--- 87,88 ----