[Pythoncard-cvs] PythonCard/tools/standaloneBuilder standaloneBuilder.py, 1.15, 1.16

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

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

Modified Files:
	standaloneBuilder.py 
Log Message:
commented out unused wxHtmlEasyPrinting import
converted wxPython to wx imports so Mac startup error works correctly


Index: standaloneBuilder.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/standaloneBuilder.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** standaloneBuilder.py	3 Nov 2006 14:56:25 -0000	1.15
--- standaloneBuilder.py	28 Jul 2007 14:53:11 -0000	1.16
***************
*** 38,42 ****
  # pythoncard imports
  import wx
! from wxPython.html import wxHtmlEasyPrinting
  from PythonCard import dialog, model, util
  from PythonCard.templates.dialogs import runOptionsDialog
--- 38,44 ----
  # pythoncard imports
  import wx
! # KEA 2007-07-28
! # unused...
! #from wxPython.html import wxHtmlEasyPrinting
  from PythonCard import dialog, model, util
  from PythonCard.templates.dialogs import runOptionsDialog
***************
*** 48,60 ****
  from PythonCard.components import button, checkbox, choice, image, imagebutton, list, notebook, spinner, staticbox, statictext, textarea, textfield
  
  # temporary hack until we get it working properly under MacOS
  if wx.Platform == '__WXMAC__':
!     from wxPython.wx import wxPySimpleApp, wxFrame, wxMessageDialog, wxICON_EXCLAMATION, wxOK, wxVERSION_STRING
!     app = wxPySimpleApp()
      title = 'Sorry!'
!     frame = wxFrame(None, -1, title)
      message = 'standaloneBuilder currently does not work properly under MacOS. This shortcoming will '
      message += 'be fixed in a future release.\n\nClick OK to exit.'
!     dialog = wxMessageDialog(frame, wrap_string(message, 52), title, wxICON_EXCLAMATION | wxOK)
      dialog.ShowModal()
      dialog.Destroy()
--- 50,64 ----
  from PythonCard.components import button, checkbox, choice, image, imagebutton, list, notebook, spinner, staticbox, statictext, textarea, textfield
  
+ # KEA 2007-07-28
+ # updated for wx package organization
  # temporary hack until we get it working properly under MacOS
  if wx.Platform == '__WXMAC__':
!     from wx import PySimpleApp, Frame, MessageDialog, ICON_EXCLAMATION, OK, VERSION_STRING
!     app = PySimpleApp()
      title = 'Sorry!'
!     frame = Frame(None, -1, title)
      message = 'standaloneBuilder currently does not work properly under MacOS. This shortcoming will '
      message += 'be fixed in a future release.\n\nClick OK to exit.'
!     dialog = MessageDialog(frame, wrap_string(message, 52), title, ICON_EXCLAMATION | OK)
      dialog.ShowModal()
      dialog.Destroy()