Changeset 5251ec6 in sasview for src/sas/sasview

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

Location:

src/sas/sasview

Files:

• sasview.py (modified) (2 diffs)
• welcome_panel.py (modified) (2 diffs)
• wxcruft.py (modified) (2 diffs)

src/sas/sasview/sasview.py

@@ -42 +42 @@
 
         from sas.sasgui.guiframe.gui_manager import SasViewApp
+        from sas.sasgui.guiframe.gui_style import GUIFRAME_ICON
         self.gui = SasViewApp(0)
+        GUIFRAME_ICON.load_icons()
         if sys.platform == "darwin":
             self.check_sasmodels_compiler()
@@ -228 +230 @@
         logger.error("Wx version: error reading version")
 
-    from . import wxcruft
-    wxcruft.call_later_fix()
+    # TODO: Do we need the call later fix for wx 3? Or is it wx < 3 only?
+    if "phoenix" in wx.PlatformInfo:
+        #wx.NewId = wx.Window.NewControlId
+        pass
+    else:
+        from . import wxcruft
+        wxcruft.call_later_fix()
     #wxcruft.trace_new_id()
     #Always use private .matplotlib setup to avoid conflicts with other

src/sas/sasview/welcome_panel.py

@@ -2 +2 @@
     Welcome page
 """
-import wx
-import wx.aui
-import wx.lib.hyperlink
 import os.path
 import os, sys
 
+import wx
+import wx.aui
+try:
+    # CRUFT: wx 4 moved hyperlink to wx.lib.agw
+    from wx.lib import hyperlink
+except ImportError:
+    from wx.lib.agw import hyperlink
 from wx.lib.scrolledpanel import ScrolledPanel
 
@@ -115 +119 @@
         send_ticket += "help@sasview.org"
         self.hyperlink_paper = \
-            wx.lib.hyperlink.HyperLinkCtrl(self, -1,
+            hyperlink.HyperLinkCtrl(self, -1,
                                            send_ticket, URL=config._license)
 

src/sas/sasview/wxcruft.py

@@ -4 +4 @@
 import wx
 from wx import Timer
-import wx._misc
 
 def call_later_fix():
@@ -16 +15 @@
 
 def NewId():
+    import wx._misc
     id = wx._misc.NewId()
     path, line, function = _get_caller()