[Pythoncard-cvs] PythonCard dialog.py,1.37,1.38

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20836

Modified Files:
	dialog.py 
Log Message:
switched back searchText, wholeWordsOnly, caseSensitive for findDialog
added additional workarounds for wx.lib.dialogs


Index: dialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/dialog.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** dialog.py	15 Aug 2004 17:55:35 -0000	1.37
--- dialog.py	17 Aug 2004 19:11:43 -0000	1.38
***************
*** 12,16 ****
  DialogResults = dialogs.DialogResults
  
! findDialog = dialogs.findDialog
  
  colorDialog = dialogs.colorDialog
--- 12,49 ----
  DialogResults = dialogs.DialogResults
  
! #findDialog = dialogs.findDialog
! # KEA 2004-08-17
! # need input and result arg names to match
! # so workaround the way it works in 2.5.2.7
! def findDialog(parent=None, searchText='', wholeWordsOnly=False, caseSensitive=False):
!     dlg = wx.Dialog(parent, -1, "Find", wx.DefaultPosition, (380, 120))
! 
!     wx.StaticText(dlg, -1, 'Find what:', (7, 10))
!     wSearchText = wx.TextCtrl(dlg, -1, searchText, (80, 7), (195, -1))
!     wSearchText.SetValue(searchText)
!     wx.Button(dlg, wx.ID_OK, "Find Next", (285, 5), wx.DefaultSize).SetDefault()
!     wx.Button(dlg, wx.ID_CANCEL, "Cancel", (285, 35), wx.DefaultSize)
! 
!     wWholeWord = wx.CheckBox(dlg, -1, 'Match whole word only',
!                             (7, 35), wx.DefaultSize, wx.NO_BORDER)
! 
!     if wholeWordsOnly:
!         wWholeWord.SetValue(1)
! 
!     wCase = wx.CheckBox(dlg, -1, 'Match case', (7, 55), wx.DefaultSize, wx.NO_BORDER)
! 
!     if caseSensitive:
!         wCase.SetValue(1)
! 
!     wSearchText.SetSelection(0, len(wSearchText.GetValue()))
!     wSearchText.SetFocus()
! 
!     result = DialogResults(dlg.ShowModal())
!     result.searchText = wSearchText.GetValue()
!     result.wholeWordsOnly = wWholeWord.GetValue()
!     result.caseSensitive = wCase.GetValue()
!     dlg.Destroy()
!     return result
! 
  
  colorDialog = dialogs.colorDialog
***************
*** 77,81 ****
  def singleChoiceDialog(parent=None, message='', title='', lst=[], 
                         style=wx.OK | wx.CANCEL | wx.CENTRE):
!     return dialogs.singleChoiceDialog(parent, message, title, lst, style | wx.DEFAULT_DIALOG_STYLE)
  
  multipleChoiceDialog = dialogs.multipleChoiceDialog
--- 110,114 ----
  def singleChoiceDialog(parent=None, message='', title='', lst=[], 
                         style=wx.OK | wx.CANCEL | wx.CENTRE):
!     return dialogs.singleChoiceDialog(parent, message, title, list(lst), style | wx.DEFAULT_DIALOG_STYLE)
  
  multipleChoiceDialog = dialogs.multipleChoiceDialog