[pywin32-checkins] pywin32/Pythonwin/pywin/mfc dialog.py, 1.3.4.2, 1.3.4.3

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

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

Modified Files:
      Tag: py3k
	dialog.py 
Log Message:
merge various fixes and changes from the trunk

Index: dialog.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/mfc/dialog.py,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -C2 -d -r1.3.4.2 -r1.3.4.3
*** dialog.py	26 Nov 2008 07:17:39 -0000	1.3.4.2
--- dialog.py	6 Dec 2008 01:48:26 -0000	1.3.4.3
***************
*** 221,228 ****
  	# uses a simple dialog to return a string object.
  	if title is None: title=win32ui.GetMainFrame().GetWindowText()
! 	class DlgSimpleInput(Dialog):
  		def __init__(self, prompt, defValue, title ):
  			self.title=title
! 			Dialog.__init__(self, win32ui.IDD_SIMPLE_INPUT)
  			self.AddDDX(win32ui.IDC_EDIT1,'result')
  			self.AddDDX(win32ui.IDC_PROMPT1, 'prompt')
--- 221,230 ----
  	# uses a simple dialog to return a string object.
  	if title is None: title=win32ui.GetMainFrame().GetWindowText()
! 	# 2to3 insists on converting 'Dialog.__init__' to 'tkinter.dialog...'
! 	DlgBaseClass = Dialog
! 	class DlgSimpleInput(DlgBaseClass):
  		def __init__(self, prompt, defValue, title ):
  			self.title=title
! 			DlgBaseClass.__init__(self, win32ui.IDD_SIMPLE_INPUT)
  			self.AddDDX(win32ui.IDC_EDIT1,'result')
  			self.AddDDX(win32ui.IDC_PROMPT1, 'prompt')
***************
*** 231,235 ****
  		def OnInitDialog(self):
  			self.SetWindowText(self.title)
! 			return Dialog.OnInitDialog(self)
  			
  	dlg=DlgSimpleInput( prompt, defValue, title)
--- 233,237 ----
  		def OnInitDialog(self):
  			self.SetWindowText(self.title)
! 			return DlgBaseClass.OnInitDialog(self)
  			
  	dlg=DlgSimpleInput( prompt, defValue, title)