[Pythoncard-cvs] PythonCard dialog.py,1.34,1.35

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

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

Modified Files:
	dialog.py 
Log Message:
fixed aFontDialog typo, included wx.lib.dialogs code as workaround


Index: dialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/dialog.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dialog.py	12 Aug 2004 19:11:13 -0000	1.34
--- dialog.py	14 Aug 2004 15:37:10 -0000	1.35
***************
*** 7,11 ****
  import wx
  from wx.lib import dialogs
! import font
  
  
--- 7,11 ----
  import wx
  from wx.lib import dialogs
! from font import Font, fontDescription
  
  
***************
*** 16,28 ****
  colorDialog = dialogs.colorDialog
  
  def fontDialog(parent, aFont=None):
!     result = dialogs.fontDialog(aFont)
      if result.accepted:
          fontData = result.fontData
          result.color = result.fontData.GetColour().Get()
          fontWx = result.fontData.GetChosenFont()
!         result.fontDescription = font.fontDescription(fontWx)
          fontWx = None
!         result.font = font.Font(result.fontDescription)
      return result
  
--- 16,60 ----
  colorDialog = dialogs.colorDialog
  
+ # KEA 2004-08-14
+ # due to a typo of mine in wx.lib.fontDialog
+ # I have to include the full version of the function here
+ def wxFontDialog(parent=None, fontData=None, font=None):
+     if fontData is None:
+         fontData = wx.FontData()
+         fontData.SetColour(wx.BLACK)
+         fontData.SetInitialFont(wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT))
+ 
+     if font is not None:
+         fontData.SetInitialFont(font)
+ 
+     dialog = wx.FontDialog(parent, fontData)
+     result = DialogResults(dialog.ShowModal())
+ 
+     if result.accepted:
+         fontData = dialog.GetFontData()
+         result.fontData = fontData
+         result.color = fontData.GetColour().Get()
+         result.colour = result.color
+         result.font = fontData.GetChosenFont()
+     else:
+         result.color = None
+         result.colour = None
+         result.font = None
+ 
+     dialog.Destroy()
+     return result
+ 
  def fontDialog(parent, aFont=None):
!     if aFont is not None:
!         aFont = aFont._getFont()
!     result = wxFontDialog(parent, font=aFont)
!     #result = dialogs.fontDialog(parent, font=aFont)
      if result.accepted:
          fontData = result.fontData
          result.color = result.fontData.GetColour().Get()
          fontWx = result.fontData.GetChosenFont()
!         result.fontDescription = fontDescription(fontWx)
          fontWx = None
!         result.font = Font(result.fontDescription)
      return result